| Message ID | 20200417212045.16917-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | bfed0eded1ce00bda5cc2d2939b017f88e6b1fd0 |
| Headers | show |
| Series | clocksource: versatile: Allow CONFIG_CLKSRC_VERSATILE to be disabled | expand |
On Fri, Apr 17, 2020 at 11:20 PM Rob Herring <robh@kernel.org> wrote: > 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> Thanks! Linus Walleij
On 17/04/2020 23:20, Rob Herring wrote: > 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> > --- > This is part of a larger effort to modularize Versatile Express support, > but this change doesn't have any dependency, so it can be applied > independently. Applied, thanks
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index f2142e6bbea3..679b35fc07a8 100644 --- 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
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> --- This is part of a larger effort to modularize Versatile Express support, but this change doesn't have any dependency, so it can be applied independently. Rob drivers/clocksource/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)