2013-03-05 09:35:07

by Paul Bolle

[permalink] [raw]
Subject: [PATCH] ARM: dove: Fix typo "COMMON_CLK_DOVE"

Commit 5b03df9ace680d7cdd34a69dfd85ca5f74159d18 ("ARM: dove: switch to
DT clock providers") added "select COMMON_CLK_DOVE" to Marvell Dove's
Kconfig entry. But there's no Kconfig symbol COMMON_CLK_DOVE, which
makes this select statement a nop. Since the Marvell Dove code includes
<linux/clk-provider.h> we can assume that this entry needs to select
COMMON_CLK instead.

Signed-off-by: Paul Bolle <[email protected]>
---
Untested.

arch/arm/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5b71469..31acce7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -556,7 +556,7 @@ config ARCH_IXP4XX
config ARCH_DOVE
bool "Marvell Dove"
select ARCH_REQUIRE_GPIOLIB
- select COMMON_CLK_DOVE
+ select COMMON_CLK
select CPU_V7
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
--
1.7.11.7


2013-03-05 14:00:32

by Jason Cooper

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: Fix typo "COMMON_CLK_DOVE"

Paul,

On Tue, Mar 05, 2013 at 10:34:58AM +0100, Paul Bolle wrote:
> Commit 5b03df9ace680d7cdd34a69dfd85ca5f74159d18 ("ARM: dove: switch to
> DT clock providers") added "select COMMON_CLK_DOVE" to Marvell Dove's
> Kconfig entry. But there's no Kconfig symbol COMMON_CLK_DOVE, which
> makes this select statement a nop. Since the Marvell Dove code includes
> <linux/clk-provider.h> we can assume that this entry needs to select
> COMMON_CLK instead.
>
> Signed-off-by: Paul Bolle <[email protected]>
> ---
> Untested.
>
> arch/arm/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Nice catch, thanks for the patch. Sebastian, could you test this and
report back?

thx,

Jason.

2013-03-05 18:02:39

by Jean-Francois Moine

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: Fix typo "COMMON_CLK_DOVE"

On Tue, 5 Mar 2013 09:00:25 -0500
Jason Cooper <[email protected]> wrote:

> On Tue, Mar 05, 2013 at 10:34:58AM +0100, Paul Bolle wrote:
> > Commit 5b03df9ace680d7cdd34a69dfd85ca5f74159d18 ("ARM: dove: switch to
> > DT clock providers") added "select COMMON_CLK_DOVE" to Marvell Dove's
> > Kconfig entry. But there's no Kconfig symbol COMMON_CLK_DOVE, which
> > makes this select statement a nop. Since the Marvell Dove code includes
> > <linux/clk-provider.h> we can assume that this entry needs to select
> > COMMON_CLK instead.
> >
> > Signed-off-by: Paul Bolle <[email protected]>
> > ---
> > Untested.
> >
> > arch/arm/Kconfig | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Nice catch, thanks for the patch. Sebastian, could you test this and
> report back?

I also have a Cubox and I generated a kernel 3.9-rc1 for it (not tested
yet).

The .config contains CONFIG_COMMON_CLK=y naturally because MACH_DOVE
selects PLAT_ORION_LEGACY which selects PLAT_ORION which selects
COMMON_CLK.

So, "select COMMON_CLK" is not needed in ARCH_DOVE.

BTW, why is there a PLAT_ORION_LEGACY?

--
Ken ar c'hentaƱ | ** Breizh ha Linux atav! **
Jef | http://moinejf.free.fr/

2013-03-05 18:23:26

by Paul Bolle

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: Fix typo "COMMON_CLK_DOVE"

On Tue, 2013-03-05 at 19:02 +0100, Jean-Francois Moine wrote:
> The .config contains CONFIG_COMMON_CLK=y naturally because MACH_DOVE
> selects PLAT_ORION_LEGACY which selects PLAT_ORION which selects
> COMMON_CLK.
>
> So, "select COMMON_CLK" is not needed in ARCH_DOVE.

Thanks. Unless people object (because they prefer an explicit, though
superfluous, select of COMMON_CLK) I'll redo my patch.


Paul Bolle

2013-03-05 18:34:12

by Sebastian Hesselbarth

[permalink] [raw]
Subject: Re: [PATCH] ARM: dove: Fix typo "COMMON_CLK_DOVE"

On 03/05/2013 10:34 AM, Paul Bolle wrote:
> Commit 5b03df9ace680d7cdd34a69dfd85ca5f74159d18 ("ARM: dove: switch to
> DT clock providers") added "select COMMON_CLK_DOVE" to Marvell Dove's
> Kconfig entry. But there's no Kconfig symbol COMMON_CLK_DOVE, which
> makes this select statement a nop. Since the Marvell Dove code includes
> <linux/clk-provider.h> we can assume that this entry needs to select
> COMMON_CLK instead.
>
> Signed-off-by: Paul Bolle<[email protected]>
> ---
> Untested.
>
> arch/arm/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 5b71469..31acce7 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -556,7 +556,7 @@ config ARCH_IXP4XX
> config ARCH_DOVE
> bool "Marvell Dove"
> select ARCH_REQUIRE_GPIOLIB
> - select COMMON_CLK_DOVE
> + select COMMON_CLK
> select CPU_V7
> select GENERIC_CLOCKEVENTS
> select MIGHT_HAVE_PCI

Paul,

thanks for the patch but I guess COMMON_CLK_DOVE is a left-over
from early DT experiments with Dove. It should just be removed
from arm/Kconfig.

Thanks for pointing it out, and it would be great to update
your patch accordingly.

Sebastian

2013-03-05 20:17:24

by Paul Bolle

[permalink] [raw]
Subject: [PATCH v2] ARM: dove: drop "select COMMON_CLK_DOVE"

Commit 5b03df9ace680d7cdd34a69dfd85ca5f74159d18 ("ARM: dove: switch to
DT clock providers") added "select COMMON_CLK_DOVE" to Marvell Dove's
Kconfig entry. But there's no Kconfig symbol COMMON_CLK_DOVE, which
makes this select statement a nop. It's probably a leftover of some
experimental code that never hit mainline. Drop it.

Signed-off-by: Paul Bolle <[email protected]>
---
0) v2: Sebastian suggested to drop this select entirely.

1) Still untested.

arch/arm/Kconfig | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5b71469..0c990b7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -556,7 +556,6 @@ config ARCH_IXP4XX
config ARCH_DOVE
bool "Marvell Dove"
select ARCH_REQUIRE_GPIOLIB
- select COMMON_CLK_DOVE
select CPU_V7
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
--
1.7.11.7

2013-03-08 21:27:03

by Jason Cooper

[permalink] [raw]
Subject: Re: [PATCH v2] ARM: dove: drop "select COMMON_CLK_DOVE"

On Tue, Mar 05, 2013 at 09:17:17PM +0100, Paul Bolle wrote:
> Commit 5b03df9ace680d7cdd34a69dfd85ca5f74159d18 ("ARM: dove: switch to
> DT clock providers") added "select COMMON_CLK_DOVE" to Marvell Dove's
> Kconfig entry. But there's no Kconfig symbol COMMON_CLK_DOVE, which
> makes this select statement a nop. It's probably a leftover of some
> experimental code that never hit mainline. Drop it.
>
> Signed-off-by: Paul Bolle <[email protected]>
> ---
> 0) v2: Sebastian suggested to drop this select entirely.
>
> 1) Still untested.
>
> arch/arm/Kconfig | 1 -
> 1 file changed, 1 deletion(-)

Applied to mvebu/fixes

thx,

Jason.