diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-06-03 09:03:21 -0400 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-06-28 04:22:14 -0400 |
commit | d683b9dcc8a8d743f7b660ff3b77ccfbe652e4b9 (patch) | |
tree | eb379652441171a5822d625d767c4ddac666afce | |
parent | 85f98db4adbbd3ec6b41537d31241b59bf47c66f (diff) |
clocksource/drivers/nspire: Add the COMPILE_TEST option
Change the Kconfig option logic to fullfil with the current approach.
A new Kconfig option is added, CONFIG_NSPIRE_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-nspire/Kconfig | 1 | ||||
-rw-r--r-- | drivers/clocksource/Kconfig | 7 | ||||
-rw-r--r-- | drivers/clocksource/Makefile | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig index bc41f26c1a12..d4985305cab2 100644 --- a/arch/arm/mach-nspire/Kconfig +++ b/arch/arm/mach-nspire/Kconfig | |||
@@ -7,5 +7,6 @@ config ARCH_NSPIRE | |||
7 | select ARM_AMBA | 7 | select ARM_AMBA |
8 | select ARM_VIC | 8 | select ARM_VIC |
9 | select ARM_TIMER_SP804 | 9 | select ARM_TIMER_SP804 |
10 | select NSPIRE_TIMER | ||
10 | help | 11 | help |
11 | This enables support for systems using the TI-NSPIRE CPU | 12 | This enables support for systems using the TI-NSPIRE CPU |
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index d425f80b1e42..0cfc4bf1c8ac 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig | |||
@@ -199,6 +199,13 @@ config U300_TIMER | |||
199 | help | 199 | help |
200 | Enables support for the U300 timer. | 200 | Enables support for the U300 timer. |
201 | 201 | ||
202 | config NSPIRE_TIMER | ||
203 | bool "NSpire timer driver" if COMPILE_TEST | ||
204 | depends on GENERIC_CLOCKEVENTS | ||
205 | select CLKSRC_MMIO | ||
206 | help | ||
207 | Enables support for the Nspire timer. | ||
208 | |||
202 | config CLKSRC_DBX500_PRCMU_SCHED_CLOCK | 209 | config CLKSRC_DBX500_PRCMU_SCHED_CLOCK |
203 | bool "Clocksource PRCMU Timer sched_clock" | 210 | bool "Clocksource PRCMU Timer sched_clock" |
204 | depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK) | 211 | depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK) |
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index adbc3a8082d0..d888c986cc43 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile | |||
@@ -32,7 +32,7 @@ obj-$(CONFIG_SUN5I_HSTIMER) += timer-sun5i.o | |||
32 | obj-$(CONFIG_MESON6_TIMER) += meson6_timer.o | 32 | obj-$(CONFIG_MESON6_TIMER) += meson6_timer.o |
33 | obj-$(CONFIG_TEGRA_TIMER) += tegra20_timer.o | 33 | obj-$(CONFIG_TEGRA_TIMER) += tegra20_timer.o |
34 | obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o | 34 | obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o |
35 | obj-$(CONFIG_ARCH_NSPIRE) += zevio-timer.o | 35 | obj-$(CONFIG_NSPIRE_TIMER) += zevio-timer.o |
36 | obj-$(CONFIG_BCM_KONA_TIMER) += bcm_kona_timer.o | 36 | obj-$(CONFIG_BCM_KONA_TIMER) += bcm_kona_timer.o |
37 | obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o | 37 | obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o |
38 | obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o | 38 | obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o |