Commit 62647969 authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Tony Lindgren

ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a

Looks like the timer.c fixes in commit ff931c82 (ARM: OMAP: clocks:
Delay clk inits atleast until slab is initialized) got lost in a
merge with da4a686a (ARM: smp_twd: convert to use CLKSRC_OF init).

Without the omap_clk_init() calls none of OMAP family of devices
boot.
Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated comments to describe merge error]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent dc2d3db8
...@@ -549,6 +549,8 @@ static inline void __init realtime_counter_init(void) ...@@ -549,6 +549,8 @@ static inline void __init realtime_counter_init(void)
clksrc_nr, clksrc_src, clksrc_prop) \ clksrc_nr, clksrc_src, clksrc_prop) \
void __init omap##name##_gptimer_timer_init(void) \ void __init omap##name##_gptimer_timer_init(void) \
{ \ { \
if (omap_clk_init) \
omap_clk_init(); \
omap_dmtimer_init(); \ omap_dmtimer_init(); \
omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \
omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \ omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \
...@@ -559,6 +561,8 @@ void __init omap##name##_gptimer_timer_init(void) \ ...@@ -559,6 +561,8 @@ void __init omap##name##_gptimer_timer_init(void) \
clksrc_nr, clksrc_src, clksrc_prop) \ clksrc_nr, clksrc_src, clksrc_prop) \
void __init omap##name##_sync32k_timer_init(void) \ void __init omap##name##_sync32k_timer_init(void) \
{ \ { \
if (omap_clk_init) \
omap_clk_init(); \
omap_dmtimer_init(); \ omap_dmtimer_init(); \
omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \
/* Enable the use of clocksource="gp_timer" kernel parameter */ \ /* Enable the use of clocksource="gp_timer" kernel parameter */ \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment