clocksource/drivers/prima2: Add the COMPILE_TEST option

Change the Kconfig option logic to fullfil with the current approach.

A new Kconfig option is added, CONFIG_PRIMA2_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>

diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 2db8d24ab67aa988bf06d1ce444d0b25d6adfc5f..9e938f2961cfc1233e6b604132a62c1c814e3b6e 100644 (file)
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -39,6 +39,7 @@ config ARCH_PRIMA2
        default y
        select SIRF_IRQ
        select ZONE_DMA
+       select PRIMA2_TIMER
        help
           Support for CSR SiRFSoC ARM Cortex A9 Platform
 

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 5d70cdfb8f63acea3bd3ea235ed50931385faffc..c350fbd805d72899b9e8726ad6cf72189fb2a0f9 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -184,6 +184,13 @@ config MXS_TIMER
        help
          Enables support for the Mxs timer.
 
+config PRIMA2_TIMER
+       bool "Prima2 timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables support for the Prima2 timer.
+
 config CLKSRC_DBX500_PRCMU_SCHED_CLOCK
        bool "Clocksource PRCMU Timer sched_clock"
        depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK)

diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 1360bbab05e026907f0c5faf432b7d7c2300fedc..b419d5da11c7269ef9b87d4a2ccc50e550b20a98 100644 (file)
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_ATLAS7_TIMER)    += timer-atlas7.o
 obj-$(CONFIG_MOXART_TIMER)     += moxart_timer.o
 obj-$(CONFIG_MXS_TIMER)                += mxs_timer.o
 obj-$(CONFIG_CLKSRC_PXA)       += pxa_timer.o
-obj-$(CONFIG_ARCH_PRIMA2)      += timer-prima2.o
+obj-$(CONFIG_PRIMA2_TIMER)     += timer-prima2.o
 obj-$(CONFIG_ARCH_U300)                += timer-u300.o
 obj-$(CONFIG_SUN4I_TIMER)      += sun4i_timer.o
 obj-$(CONFIG_SUN5I_HSTIMER)    += timer-sun5i.o