| Message ID | 1346106374-3283-1-git-send-email-grinberg@compulab.co.il (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 27, 2012 at 3:26 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: > Currently, omap2_sync32k_clocksource_init() function initializes the 32K > timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER > setting. > Fix this by providing a default implementation for > !CONFIG_OMAP_32K_TIMER case. > > Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> > Reviewed-by: Paul Walmsley <paul@pwsan.com> > --- Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
On 08/28/12 01:43, Shilimkar, Santosh wrote: > On Mon, Aug 27, 2012 at 3:26 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: >> Currently, omap2_sync32k_clocksource_init() function initializes the 32K >> timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER >> setting. >> Fix this by providing a default implementation for >> !CONFIG_OMAP_32K_TIMER case. >> >> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> >> Reviewed-by: Paul Walmsley <paul@pwsan.com> >> --- > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Thanks Santosh! Tony, apparently, this bug has been there for a while, so probably I should have added: Cc: stable@vger.kernel.org Thanks!
* Igor Grinberg <grinberg@compulab.co.il> [120829 15:02]: > On 08/28/12 01:43, Shilimkar, Santosh wrote: > > On Mon, Aug 27, 2012 at 3:26 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: > >> Currently, omap2_sync32k_clocksource_init() function initializes the 32K > >> timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER > >> setting. > >> Fix this by providing a default implementation for > >> !CONFIG_OMAP_32K_TIMER case. > >> > >> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> > >> Reviewed-by: Paul Walmsley <paul@pwsan.com> > >> --- > > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > > Thanks Santosh! > > Tony, apparently, this bug has been there for a while, > so probably I should have added: > Cc: stable@vger.kernel.org Thanks I'll apply this into fixes with Cc: stable. Note that Cc: stable is usually added at commit time, or at least you're not supposed to send the patch for review there. Regards, Tony
On 08/30/12 23:20, Tony Lindgren wrote: > * Igor Grinberg <grinberg@compulab.co.il> [120829 15:02]: >> On 08/28/12 01:43, Shilimkar, Santosh wrote: >>> On Mon, Aug 27, 2012 at 3:26 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: >>>> Currently, omap2_sync32k_clocksource_init() function initializes the 32K >>>> timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER >>>> setting. >>>> Fix this by providing a default implementation for >>>> !CONFIG_OMAP_32K_TIMER case. >>>> >>>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> >>>> Reviewed-by: Paul Walmsley <paul@pwsan.com> >>>> --- >>> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >> >> Thanks Santosh! >> >> Tony, apparently, this bug has been there for a while, >> so probably I should have added: >> Cc: stable@vger.kernel.org > > Thanks I'll apply this into fixes with Cc: stable. Note that > Cc: stable is usually added at commit time, or at least you're > not supposed to send the patch for review there. Yeah yeah, I know, I just forgot to add it while committing. Thanks!
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 840929b..2cdbcc7 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -263,6 +263,7 @@ static u32 notrace dmtimer_read_sched_clock(void) return 0; } +#ifdef CONFIG_OMAP_32K_TIMER /* Setup free-running counter for clocksource */ static int __init omap2_sync32k_clocksource_init(void) { @@ -302,6 +303,12 @@ static int __init omap2_sync32k_clocksource_init(void) return ret; } +#else +static inline int omap2_sync32k_clocksource_init(void) +{ + return -ENODEV; +} +#endif static void __init omap2_gptimer_clocksource_init(int gptimer_id, const char *fck_source)