clocksource/drivers/versatile: Allow CONFIG_CLKSRC_VERSATILE to be disabled

The timer-versatile driver provides a sched_clock for certain Arm Ltd.
reference platforms. Specifically, it is used on Versatile and 32-bit
VExpress. It is not needed for those platforms with an arch timer (all
the 64-bit ones) yet CONFIG_MFD_VEXPRESS_SYSREG does still need to be
enabled. In that case, the timer-versatile can only be disabled when
COMPILE_TEST is enabled which is not desirable. Let's use the sub-arch
kconfig symbols instead.

Realview platforms don't have the sysregs that this driver uses so
correct the help text.

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200417212045.16917-1-robh@kernel.org

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index f225c27b70f74fb807a16082f7283842ce037e87..9c2d72b33e89a79db7d9a5b341adf18804b0cb0d 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -562,12 +562,11 @@ config CLKSRC_VERSATILE
        bool "ARM Versatile (Express) reference platforms clock source" if COMPILE_TEST
        depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
        select TIMER_OF
-       default y if MFD_VEXPRESS_SYSREG
+       default y if (ARCH_VEXPRESS || ARCH_VERSATILE) && ARM
        help
          This option enables clock source based on free running
          counter available in the "System Registers" block of
-         ARM Versatile, RealView and Versatile Express reference
-         platforms.
+         ARM Versatile and Versatile Express reference platforms.
 
 config CLKSRC_MIPS_GIC
        bool