aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2')
-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 f12aa6c15da4..31ae76481737 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -549,6 +549,8 @@ static inline void __init realtime_counter_init(void)
549 clksrc_nr, clksrc_src, clksrc_prop) \ 549 clksrc_nr, clksrc_src, clksrc_prop) \
550void __init omap##name##_gptimer_timer_init(void) \ 550void __init omap##name##_gptimer_timer_init(void) \
551{ \ 551{ \
552 if (omap_clk_init) \
553 omap_clk_init(); \
552 omap_dmtimer_init(); \ 554 omap_dmtimer_init(); \
553 omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ 555 omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \
554 omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \ 556 omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \
@@ -559,6 +561,8 @@ void __init omap##name##_gptimer_timer_init(void) \
559 clksrc_nr, clksrc_src, clksrc_prop) \ 561 clksrc_nr, clksrc_src, clksrc_prop) \
560void __init omap##name##_sync32k_timer_init(void) \ 562void __init omap##name##_sync32k_timer_init(void) \
561{ \ 563{ \
564 if (omap_clk_init) \
565 omap_clk_init(); \
562 omap_dmtimer_init(); \ 566 omap_dmtimer_init(); \
563 omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ 567 omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \
564 /* Enable the use of clocksource="gp_timer" kernel parameter */ \ 568 /* Enable the use of clocksource="gp_timer" kernel parameter */ \