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 <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Linus Walleij <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
---
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(-)
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
--
2.20.1
On Fri, Apr 17, 2020 at 11:20 PM Rob Herring <[email protected]> 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 <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Linus Walleij <[email protected]>
> Signed-off-by: Rob Herring <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
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 <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Linus Walleij <[email protected]>
> Signed-off-by: Rob Herring <[email protected]>
> ---
> 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
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
The following commit has been merged into the timers/core branch of tip:
Commit-ID: bfed0eded1ce00bda5cc2d2939b017f88e6b1fd0
Gitweb: https://git.kernel.org/tip/bfed0eded1ce00bda5cc2d2939b017f88e6b1fd0
Author: Rob Herring <[email protected]>
AuthorDate: Fri, 17 Apr 2020 16:20:45 -05:00
Committer: Daniel Lezcano <[email protected]>
CommitterDate: Mon, 27 Apr 2020 11:33:44 +02:00
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 <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Linus Walleij <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
drivers/clocksource/Kconfig | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index f225c27..9c2d72b 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