Message ID | 20130506233743.GJ28721@atomide.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
> -----Original Message----- > From: Tony Lindgren [mailto:tony@atomide.com] > Sent: Tuesday, May 07, 2013 5:08 AM > To: Hiremath, Vaibhav > Cc: linux-omap@vger.kernel.org; linux-kernel@vger.kernel.org; linux- > arm-kernel@lists.infradead.org > Subject: Re: mach-omap2/timer.c: Bug introduced while merging patch - > ff931c82 > > * Hiremath, Vaibhav <hvaibhav@ti.com> [130506 11:35]: > > > > Ohh yeah, I already have a patch for it - > > Thanks, I'll add that into omap-for-v3.10/fixes. I modified > the comments a bit trying to figure out where it changed, updated > patch below. > Thanks Tony. Thanks, Vaibhav
--- 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 */ \