aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r--arch/arm/mach-omap2/timer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 58d86d7abada..95e79a582f58 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -553,6 +553,8 @@ static inline void __init realtime_counter_init(void)
553 clksrc_nr, clksrc_src) \ 553 clksrc_nr, clksrc_src) \
554void __init omap##name##_gptimer_timer_init(void) \ 554void __init omap##name##_gptimer_timer_init(void) \
555{ \ 555{ \
556 if (omap_clk_init) \
557 omap_clk_init(); \
556 omap_dmtimer_init(); \ 558 omap_dmtimer_init(); \
557 omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ 559 omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \
558 omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src); \ 560 omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src); \
@@ -562,6 +564,8 @@ void __init omap##name##_gptimer_timer_init(void) \
562 clksrc_nr, clksrc_src) \ 564 clksrc_nr, clksrc_src) \
563void __init omap##name##_sync32k_timer_init(void) \ 565void __init omap##name##_sync32k_timer_init(void) \
564{ \ 566{ \
567 if (omap_clk_init) \
568 omap_clk_init(); \
565 omap_dmtimer_init(); \ 569 omap_dmtimer_init(); \
566 omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ 570 omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \
567 /* Enable the use of clocksource="gp_timer" kernel parameter */ \ 571 /* Enable the use of clocksource="gp_timer" kernel parameter */ \