Skip to contentSkip to conversation

ARM: OMAP2+: timer: add probe for clocksources

PATCH New Tero Kristo 2 participants 2 messages Jun 16, 2016 – Jun 17, 2016

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Tero Kristo

author
#0 lore raw

PATCH 1/1 ARM: OMAP2+: timer: add probe for clocksources

A few platforms are currently missing clocksource_probe() completely in their time_init functionality. On OMAP3430 for example, this is causing cpuidle to be pretty much dead, as the counter32k is not going to be registered and instead a gptimer is used as a clocksource. This will tick in periodic mode, preventing any deeper idle states.

While here, also drop one unnecessary check for populated DT before existing clocksource_probe() call.

Signed-off-by Tero Kristo <[email protected]>
---
 arch/arm/mach-omap2/timer.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/timer.c +5 -2
index 5b385bb..cb9497a 100644
@@ -496,8 +496,7 @@ void __init omap_init_time(void)
 	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
 			2, "timer_sys_ck", NULL, false);
 
-	if (of_have_populated_dt())
-		clocksource_probe();
+	clocksource_probe();
 }
 
 #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX)

@@ -505,6 +504,8 @@ void __init omap3_secure_sync32k_timer_init(void)
 {
 	__omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",
 			2, "timer_sys_ck", NULL, false);
+
+	clocksource_probe();
 }
 #endif /* CONFIG_ARCH_OMAP3 */
 

@@ -513,6 +514,8 @@ void __init omap3_gptimer_timer_init(void)
 {
 	__omap_sync32k_timer_init(2, "timer_sys_ck", NULL,
 			1, "timer_sys_ck", "ti,timer-alwon", true);
+
+	clocksource_probe();
 }
 #endif
Signature · 1 line
1.9.1
maintainer
#1 lore raw

PATCH 1/1 ARM: OMAP2+: timer: add probe for clocksources

Quoted 8 lines · Tero Kristo

A few platforms are currently missing clocksource_probe() completely in their time_init functionality. On OMAP3430 for example, this is causing cpuidle to be pretty much dead, as the counter32k is not going to be registered and instead a gptimer is used as a clocksource. This will tick in periodic mode, preventing any deeper idle states.

While here, also drop one unnecessary check for populated DT before existing clocksource_probe() call.

Good catch, applying into omap-for-v4.7/fixes thanks.

Tony