Commit 11786191 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwlock-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc

Pull hwspinlock updates from Bjorn Andersson:
 "This marks all hwspinlock driver COMPILE_TESTable and replaces the
  zero-length array in hwspinlock_device with a flexible-array member"

* tag 'hwlock-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
  hwspinlock: hwspinlock_internal.h: Replace zero-length array with flexible-array member
  hwspinlock: Allow drivers to be built with COMPILE_TEST
parents c6570114 ef17f519
...@@ -9,7 +9,7 @@ menuconfig HWSPINLOCK ...@@ -9,7 +9,7 @@ menuconfig HWSPINLOCK
config HWSPINLOCK_OMAP config HWSPINLOCK_OMAP
tristate "OMAP Hardware Spinlock device" tristate "OMAP Hardware Spinlock device"
depends on HWSPINLOCK depends on HWSPINLOCK
depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX || SOC_AM33XX || SOC_AM43XX || ARCH_K3 depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX || SOC_AM33XX || SOC_AM43XX || ARCH_K3 || COMPILE_TEST
help help
Say y here to support the OMAP Hardware Spinlock device (firstly Say y here to support the OMAP Hardware Spinlock device (firstly
introduced in OMAP4). introduced in OMAP4).
...@@ -19,7 +19,7 @@ config HWSPINLOCK_OMAP ...@@ -19,7 +19,7 @@ config HWSPINLOCK_OMAP
config HWSPINLOCK_QCOM config HWSPINLOCK_QCOM
tristate "Qualcomm Hardware Spinlock device" tristate "Qualcomm Hardware Spinlock device"
depends on HWSPINLOCK depends on HWSPINLOCK
depends on ARCH_QCOM depends on ARCH_QCOM || COMPILE_TEST
select MFD_SYSCON select MFD_SYSCON
help help
Say y here to support the Qualcomm Hardware Mutex functionality, which Say y here to support the Qualcomm Hardware Mutex functionality, which
...@@ -31,7 +31,7 @@ config HWSPINLOCK_QCOM ...@@ -31,7 +31,7 @@ config HWSPINLOCK_QCOM
config HWSPINLOCK_SIRF config HWSPINLOCK_SIRF
tristate "SIRF Hardware Spinlock device" tristate "SIRF Hardware Spinlock device"
depends on HWSPINLOCK depends on HWSPINLOCK
depends on ARCH_SIRF depends on ARCH_SIRF || COMPILE_TEST
help help
Say y here to support the SIRF Hardware Spinlock device, which Say y here to support the SIRF Hardware Spinlock device, which
provides a synchronisation mechanism for the various processors provides a synchronisation mechanism for the various processors
...@@ -42,7 +42,7 @@ config HWSPINLOCK_SIRF ...@@ -42,7 +42,7 @@ config HWSPINLOCK_SIRF
config HWSPINLOCK_SPRD config HWSPINLOCK_SPRD
tristate "SPRD Hardware Spinlock device" tristate "SPRD Hardware Spinlock device"
depends on ARCH_SPRD depends on ARCH_SPRD || COMPILE_TEST
depends on HWSPINLOCK depends on HWSPINLOCK
help help
Say y here to support the SPRD Hardware Spinlock device. Say y here to support the SPRD Hardware Spinlock device.
...@@ -51,7 +51,7 @@ config HWSPINLOCK_SPRD ...@@ -51,7 +51,7 @@ config HWSPINLOCK_SPRD
config HWSPINLOCK_STM32 config HWSPINLOCK_STM32
tristate "STM32 Hardware Spinlock device" tristate "STM32 Hardware Spinlock device"
depends on MACH_STM32MP157 depends on MACH_STM32MP157 || COMPILE_TEST
depends on HWSPINLOCK depends on HWSPINLOCK
help help
Say y here to support the STM32 Hardware Spinlock device. Say y here to support the STM32 Hardware Spinlock device.
...@@ -61,7 +61,7 @@ config HWSPINLOCK_STM32 ...@@ -61,7 +61,7 @@ config HWSPINLOCK_STM32
config HSEM_U8500 config HSEM_U8500
tristate "STE Hardware Semaphore functionality" tristate "STE Hardware Semaphore functionality"
depends on HWSPINLOCK depends on HWSPINLOCK
depends on ARCH_U8500 depends on ARCH_U8500 || COMPILE_TEST
help help
Say y here to support the STE Hardware Semaphore functionality, which Say y here to support the STE Hardware Semaphore functionality, which
provides a synchronisation mechanism for the various processor on the provides a synchronisation mechanism for the various processor on the
......
...@@ -56,7 +56,7 @@ struct hwspinlock_device { ...@@ -56,7 +56,7 @@ struct hwspinlock_device {
const struct hwspinlock_ops *ops; const struct hwspinlock_ops *ops;
int base_id; int base_id;
int num_locks; int num_locks;
struct hwspinlock lock[0]; struct hwspinlock lock[];
}; };
static inline int hwlock_to_id(struct hwspinlock *hwlock) static inline int hwlock_to_id(struct hwspinlock *hwlock)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment