diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-06-03 07:29:03 -0400 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-06-28 04:22:08 -0400 |
commit | 419be9e36cf2349f15d0b7280ba46be6f9da7a61 (patch) | |
tree | 6bb31a9a0cb1fe957696882f2d184f58840f4458 | |
parent | b56d5d218499404b2abfd6f33a6d480312bf8a92 (diff) |
clocksource/drivers/moxart: Add the COMPILE_TEST option
Change the Kconfig option logic to fullfil with the current approach.
A new Kconfig option is added, CONFIG_MOXART_TIMER and is selected by the
platform. Then the clocksource's Kconfig is changed to make this option
selectable by the user if the COMPILE_TEST option is set. Otherwise, it is
up to the platform's Kconfig to select the timer.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r-- | arch/arm/mach-moxart/Kconfig | 2 | ||||
-rw-r--r-- | drivers/clocksource/Kconfig | 7 | ||||
-rw-r--r-- | drivers/clocksource/Makefile | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-moxart/Kconfig b/arch/arm/mach-moxart/Kconfig index 180d9d216719..ddc79cea32d3 100644 --- a/arch/arm/mach-moxart/Kconfig +++ b/arch/arm/mach-moxart/Kconfig | |||
@@ -3,7 +3,7 @@ menuconfig ARCH_MOXART | |||
3 | depends on ARCH_MULTI_V4 | 3 | depends on ARCH_MULTI_V4 |
4 | select CPU_FA526 | 4 | select CPU_FA526 |
5 | select ARM_DMA_MEM_BUFFERABLE | 5 | select ARM_DMA_MEM_BUFFERABLE |
6 | select CLKSRC_MMIO | 6 | select MOXART_TIMER |
7 | select GENERIC_IRQ_CHIP | 7 | select GENERIC_IRQ_CHIP |
8 | select ARCH_REQUIRE_GPIOLIB | 8 | select ARCH_REQUIRE_GPIOLIB |
9 | select PHYLIB if NETDEVICES | 9 | select PHYLIB if NETDEVICES |
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 669dd3cd0291..db2c5ff6957e 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig | |||
@@ -169,6 +169,13 @@ config ATLAS7_TIMER | |||
169 | help | 169 | help |
170 | Enables support for the Atlas7 timer. | 170 | Enables support for the Atlas7 timer. |
171 | 171 | ||
172 | config MOXART_TIMER | ||
173 | bool "Moxart timer driver" if COMPILE_TEST | ||
174 | depends on GENERIC_CLOCKEVENTS | ||
175 | select CLKSRC_MMIO | ||
176 | help | ||
177 | Enables support for the Moxart timer. | ||
178 | |||
172 | config CLKSRC_DBX500_PRCMU_SCHED_CLOCK | 179 | config CLKSRC_DBX500_PRCMU_SCHED_CLOCK |
173 | bool "Clocksource PRCMU Timer sched_clock" | 180 | bool "Clocksource PRCMU Timer sched_clock" |
174 | depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK) | 181 | depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK) |
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 7abf144ac6cc..e64e37a5f8a0 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile | |||
@@ -22,7 +22,7 @@ obj-$(CONFIG_ORION_TIMER) += time-orion.o | |||
22 | obj-$(CONFIG_BCM2835_TIMER) += bcm2835_timer.o | 22 | obj-$(CONFIG_BCM2835_TIMER) += bcm2835_timer.o |
23 | obj-$(CONFIG_CLPS711X_TIMER) += clps711x-timer.o | 23 | obj-$(CONFIG_CLPS711X_TIMER) += clps711x-timer.o |
24 | obj-$(CONFIG_ATLAS7_TIMER) += timer-atlas7.o | 24 | obj-$(CONFIG_ATLAS7_TIMER) += timer-atlas7.o |
25 | obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o | 25 | obj-$(CONFIG_MOXART_TIMER) += moxart_timer.o |
26 | obj-$(CONFIG_ARCH_MXS) += mxs_timer.o | 26 | obj-$(CONFIG_ARCH_MXS) += mxs_timer.o |
27 | obj-$(CONFIG_CLKSRC_PXA) += pxa_timer.o | 27 | obj-$(CONFIG_CLKSRC_PXA) += pxa_timer.o |
28 | obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o | 28 | obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o |