Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1240755

[PATCH 06/11] arm: omap2: timer: always call clocksource_of_init() when DT

Show all headers | View raw

If booting with DT, let's make sure to always
call clocksource_of_init() as this will make
it easier to move timer code to drivers/clocksource
in the future.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap2/timer.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index dcc0f032e717..b523426f38a5 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -496,6 +496,9 @@ void __init omap_sync32k_timer_init(void)
 {
 	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
 			2, "timer_sys_ck", NULL, false);
+
+	if (of_have_populated_dt())
+		clocksource_of_init();
 }
 
 #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX)
@@ -519,7 +522,6 @@ void __init omap3_gptimer_timer_init(void)
 void __init omap4_local_timer_init(void)
 {
 	omap_sync32k_timer_init();
-	clocksource_of_init();
 }
 #endif
 
@@ -640,10 +642,8 @@ sysclk1_based:
 
 void __init omap5_realtime_timer_init(void)
 {
-	omap_sync32k_timer_init();
 	realtime_counter_init();
-
-	clocksource_of_init();
+	omap_sync32k_timer_init();
 }
 #endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */
 
-- 
2.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/11] arm: omap: counter32k rework Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
  [PATCH 07/11] arm: omap2: timer: remove omap4_local_timer_init Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
  [PATCH 04/11] arm: omap2: timer: provide generic sync32k_timer_init function Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
    Re: [PATCH 04/11] arm: omap2: timer: provide generic  sync32k_timer_init function Suman Anna <s-anna@ti.com> - 2015-10-06 20:40 +0200
      Re: [PATCH 04/11] arm: omap2: timer: provide generic sync32k_timer_init function Felipe Balbi <balbi@ti.com> - 2015-10-06 21:20 +0200
  [PATCH 02/11] arm: omap2: timer: add a gptimer argument to sync32k_timer_init() Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
  [PATCH 06/11] arm: omap2: timer: always call clocksource_of_init() when DT Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
  [PATCH 09/11] clocksource: add TI 32.768 Hz counter driver Felipe Balbi <balbi@ti.com> - 2015-10-06 19:10 +0200
    Re: [PATCH 09/11] clocksource: add TI 32.768 Hz counter driver Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-10-07 01:30 +0200
      Re: [PATCH 09/11] clocksource: add TI 32.768 Hz counter driver Felipe Balbi <balbi@TI.COM> - 2015-10-07 05:10 +0200

csiph-web