clocksource/drivers/integrator-ap: Add the COMPILE_TEST option

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

A new Kconfig option is added, CONFIG_INTEGRATOR_AP_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-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index b2a85ba13f088fb451377fa09d800df34e926846..291262e5aeaf3a14682ff3cb0ae914fd76e7615f 100644 (file)
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -20,7 +20,7 @@ if ARCH_INTEGRATOR
 
 config ARCH_INTEGRATOR_AP
        bool "Support Integrator/AP and Integrator/PP2 platforms"
-       select CLKSRC_MMIO
+       select INTEGRATOR_AP_TIMER
        select MIGHT_HAVE_PCI
        select SERIAL_AMBA_PL010 if TTY
        select SERIAL_AMBA_PL010_CONSOLE if TTY

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 7e5709a1e4f0fde1a0fe4a436d1d959a78d96842..8055b37347fffc65eeaeb4cc199edb1b1f734402 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -214,6 +214,13 @@ config KEYSTONE_TIMER
        help
          Enables support for the Keystone timer.
 
+config INTEGRATOR_AP_TIMER
+       bool "Integrator-ap timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables support for the Integrator-ap 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 a8184319c41f2239250fc24f668b117668deaa03..fd9d6df0bbc0993c3b7862a08f89dc3a9725be9d 100644 (file)
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -57,7 +57,7 @@ obj-$(CONFIG_ARM_TIMER_SP804)         += timer-sp804.o
 obj-$(CONFIG_CLKSRC_METAG_GENERIC)     += metag_generic.o
 obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST)  += dummy_timer.o
 obj-$(CONFIG_KEYSTONE_TIMER)           += timer-keystone.o
-obj-$(CONFIG_ARCH_INTEGRATOR_AP)       += timer-integrator-ap.o
+obj-$(CONFIG_INTEGRATOR_AP_TIMER)      += timer-integrator-ap.o
 obj-$(CONFIG_CLKSRC_VERSATILE)         += versatile.o
 obj-$(CONFIG_CLKSRC_MIPS_GIC)          += mips-gic-timer.o
 obj-$(CONFIG_CLKSRC_TANGO_XTAL)                += tango_xtal.o