diff options
| author | Vaibhav Hiremath <hvaibhav@ti.com> | 2013-05-06 16:39:16 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-05-06 16:39:16 -0700 |
| commit | 626479696d2b0c3a68a4fd24c3ee759c7d2b4ea1 (patch) | |
| tree | 09ae611224551d1fff25c83a8bbc9ef6ffac572d /arch | |
| parent | dc2d3db8137fba0f62d7517e1bea8a47f69fcbc4 (diff) | |
| download | linux-3.10-626479696d2b0c3a68a4fd24c3ee759c7d2b4ea1.tar.gz linux-3.10-626479696d2b0c3a68a4fd24c3ee759c7d2b4ea1.tar.bz2 linux-3.10-626479696d2b0c3a68a4fd24c3ee759c7d2b4ea1.zip | |
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: Vaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated comments to describe merge error]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index f12aa6c15da..31ae7648173 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) clksrc_nr, clksrc_src, clksrc_prop) \ void __init omap##name##_gptimer_timer_init(void) \ { \ + if (omap_clk_init) \ + omap_clk_init(); \ omap_dmtimer_init(); \ omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \ @@ -559,6 +561,8 @@ void __init omap##name##_gptimer_timer_init(void) \ clksrc_nr, clksrc_src, clksrc_prop) \ void __init omap##name##_sync32k_timer_init(void) \ { \ + if (omap_clk_init) \ + omap_clk_init(); \ omap_dmtimer_init(); \ omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ /* Enable the use of clocksource="gp_timer" kernel parameter */ \ |