[PATCH] arm: mvebu: use the main timer as clock source from DT

Jason Cooper jason at lakedaemon.net
Wed Sep 18 12:54:01 EDT 2013


On Wed, Sep 18, 2013 at 06:45:09PM +0200, Thomas Petazzoni wrote:
> Dear Jean Pihet,
> 
> On Wed, 18 Sep 2013 17:53:44 +0200, Jean Pihet wrote:
> > This commit:
> >   573145f08c2b92c45498468afbbba909f6ce6135
> >   clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
> > 
> > replaced a call to the driver's timer initialization by a call to
> > clocksource_of_init(). However, it failed to select CONFIG_CLKSRC_OF.
> > 
> > Fix this by selecting CONFIG_CLKSRC_OF for Armada370/XP machines.
> > Without this change the kernel is stuck at: 'Calibrating delay
> > loop...'.
> > 
> > Signed-off-by: Jean Pihet <jean.pihet at linaro.org>
> > Acked-by: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
> > ---
> >  arch/arm/mach-mvebu/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> > index 9eb63d7..25e6c00 100644
> > --- a/arch/arm/mach-mvebu/Kconfig
> > +++ b/arch/arm/mach-mvebu/Kconfig
> > @@ -26,6 +26,7 @@ config MACH_ARMADA_370_XP
> >  	select HAVE_SMP
> >  	select CACHE_L2X0
> >  	select CPU_PJ4B
> > +	select CLKSRC_OF
> 
> I disagree. This should go to drivers/clocksource/Kconfig, because it's
> the clocksource driver that uses CLOCKSOURCE_OF_DECLARE. See what is
> already done in drivers/clocksource/Kconfig for other drivers.

Ack.  I missed the 'select ARMADA_370_XP_TIMER' for this block since it
was outside the context.

Jean, please fix this up and resubmit to Daniel Lezcano.

I'll drop this version from my tree.

thx,

Jason.



More information about the linux-arm-kernel mailing list