[tip: timers/core] arm: zynq: don't disable CONFIG_ARM_GLOBAL_TIMER due to CONFIG_CPU_FREQ anymore

From: tip-bot2 for Andrea Merello
Date: Fri Jun 18 2021 - 12:03:53 EST


The following commit has been merged into the timers/core branch of tip:

Commit-ID: 68e2215e9d5f5ec8e5ba0158683742932519cad9
Gitweb: https://git.kernel.org/tip/68e2215e9d5f5ec8e5ba0158683742932519cad9
Author: Andrea Merello <andrea.merello@xxxxxxxxx>
AuthorDate: Tue, 06 Apr 2021 15:00:45 +02:00
Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
CommitterDate: Wed, 16 Jun 2021 17:33:04 +02:00

arm: zynq: don't disable CONFIG_ARM_GLOBAL_TIMER due to CONFIG_CPU_FREQ anymore

Now ARM global timer driver could work even if it's source clock rate
changes, so we don't need to disable that driver when cpu frequency scaling
is in use.

This cause Zynq arch to get support for timer delay and get_cycles().

Signed-off-by: Andrea Merello <andrea.merello@xxxxxxxxx>
Cc: Patrice Chotard <patrice.chotard@xxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: Michal Simek <michal.simek@xxxxxxxxxx>
Cc: Sören Brinkmann <soren.brinkmann@xxxxxxxxxx>
Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20210406130045.15491-3-andrea.merello@xxxxxxxxx
---
arch/arm/mach-zynq/Kconfig | 2 +-
drivers/clocksource/Kconfig | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 43fb941..a56748d 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -6,7 +6,7 @@ config ARCH_ZYNQ
select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_AMBA
select ARM_GIC
- select ARM_GLOBAL_TIMER if !CPU_FREQ
+ select ARM_GLOBAL_TIMER
select CADENCE_TTC_TIMER
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 19fc5f8..9fa2823 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -360,6 +360,7 @@ config ARM_GLOBAL_TIMER

config ARM_GT_INITIAL_PRESCALER_VAL
int "ARM global timer initial prescaler value"
+ default 2 if ARCH_ZYNQ
default 1
depends on ARM_GLOBAL_TIMER
help