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

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

[Jean Pihet]

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@linaro.org>
Acked-by: Ezequiel Garcia <ezequiel.garcia@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
 
 config MACH_ARMADA_370
 	bool "Marvell Armada 370 boards"
-- 
1.7.11.7

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

[Jason Cooper]

On Wed, Sep 18, 2013 at 05:53:44PM +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@linaro.org>
> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
>  arch/arm/mach-mvebu/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

Applied to mvebu/fixes

thx,

Jason.

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

[Thomas Petazzoni]

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@linaro.org>
> Acked-by: Ezequiel Garcia <ezequiel.garcia@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.

Thanks,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

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

[Jason Cooper]

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@linaro.org>
> > Acked-by: Ezequiel Garcia <ezequiel.garcia@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.

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

[Jean Pihet]

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@linaro.org>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 drivers/clocksource/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 41c6946..971d796 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -26,6 +26,7 @@ config DW_APB_TIMER_OF
 
 config ARMADA_370_XP_TIMER
 	bool
+	select CLKSRC_OF
 
 config ORION_TIMER
 	select CLKSRC_OF
-- 
1.7.11.7

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

[Jean Pihet]

Hi Jason, Thomas,

On 18 September 2013 18:54, Jason Cooper <jason@lakedaemon.net> wrote:
> 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@linaro.org>
>> > Acked-by: Ezequiel Garcia <ezequiel.garcia@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.
I agree. I just did like the other platforms in arch/arm are doing
which is obviously wrong.

> Jean, please fix this up and resubmit to Daniel Lezcano.
Just re-submitted the new version.

>
> I'll drop this version from my tree.
Ok, thx. Sorry for the extra handling.

>
> thx,
>
> Jason.

Thx,
Jean

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

[Jason Cooper]

Adding clocksource maintainers to the Cc: ...

On Wed, Sep 18, 2013 at 08:49:28PM +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@linaro.org>
> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
>  drivers/clocksource/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

Acked-by: Jason Cooper <jason@lakedaemon.net>

Daniel, John, Thomas,

Can you queue this up for v3.12-rc2?  It fixes a boot breakage.

thx,

Jason.

> 
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index 41c6946..971d796 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -26,6 +26,7 @@ config DW_APB_TIMER_OF
>  
>  config ARMADA_370_XP_TIMER
>  	bool
> +	select CLKSRC_OF
>  
>  config ORION_TIMER
>  	select CLKSRC_OF
> -- 
> 1.7.11.7
> 

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

[Ezequiel Garcia]

On Wed, Sep 18, 2013 at 02:56:11PM -0400, Jason Cooper wrote:
> Adding clocksource maintainers to the Cc: ...
> 
> On Wed, Sep 18, 2013 at 08:49:28PM +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@linaro.org>
> > Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> > ---
> >  drivers/clocksource/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> 
> Acked-by: Jason Cooper <jason@lakedaemon.net>
> 
> Daniel, John, Thomas,
> 
> Can you queue this up for v3.12-rc2?  It fixes a boot breakage.
> 

Is this already merged somewhere? Is there any chance we can push
it through *any* tree so it makes -rc3?

Thanks,
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

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

[Daniel Lezcano]

On 09/25/2013 12:39 PM, Ezequiel Garcia wrote:
> On Wed, Sep 18, 2013 at 02:56:11PM -0400, Jason Cooper wrote:
>> Adding clocksource maintainers to the Cc: ...
>>
>> On Wed, Sep 18, 2013 at 08:49:28PM +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@linaro.org>
>>> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
>>> ---
>>>  drivers/clocksource/Kconfig | 1 +
>>>  1 file changed, 1 insertion(+)
>>
>> Acked-by: Jason Cooper <jason@lakedaemon.net>
>>
>> Daniel, John, Thomas,
>>
>> Can you queue this up for v3.12-rc2?  It fixes a boot breakage.
>>
> 
> Is this already merged somewhere? Is there any chance we can push
> it through *any* tree so it makes -rc3?

Yes, I will take it in my tree.


-- 
 <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog