omap2+: Reserve clocksource and timesource and initialize dmtimer later

There's no need to initialize the dmtimer framework early.
Just mark the clocksource and timesource as reserved, and
initialize dmtimer with an arch_initcall.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 578e9df4fdea..cf2ec85b95fa 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -69,6 +69,8 @@
 /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */
 #define MAX_GPTIMER_ID          12
 
+u32 sys_timer_reserved;
+
 /* Clockevent code */
 
 static struct omap_dm_timer clkev;
@@ -195,6 +197,8 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
 
         omap_hwmod_enable(oh);
 
+        sys_timer_reserved |= (1 << (gptimer_id - 1));
+
         if (gptimer_id != 12) {
                 struct clk *src;
 
@@ -321,7 +325,6 @@ static void __init omap2_gp_clocksource_init(void)
 #define OMAP_SYS_TIMER_INIT(name, clkev_nr, clkev_src)                  \
 static void __init omap##name##_timer_init(void)                        \
 {                                                                       \
-        omap_dm_timer_init();                                           \
         omap2_gp_clockevent_init((clkev_nr), clkev_src);                \
         omap2_gp_clocksource_init();                                    \
 }
@@ -350,7 +353,6 @@ static void __init omap4_timer_init(void)
         twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256);
         BUG_ON(!twd_base);
 #endif
-        omap_dm_timer_init();
         omap2_gp_clockevent_init(1, OMAP4_CLKEV_SOURCE);
         omap2_gp_clocksource_init();
 }