diff mbox

[1/3] ARM: mvebu: clean-up unneeded kconfig selects

Message ID 1398195678-28787-2-git-send-email-robherring2@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Rob Herring April 22, 2014, 7:41 p.m. UTC
From: Rob Herring <robh@kernel.org>

Multi-platform support implies all these options are already selected and
individual platforms don't need to select them.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
 arch/arm/mach-mvebu/Kconfig | 6 ------
 1 file changed, 6 deletions(-)

Comments

Andrew Lunn April 22, 2014, 8:58 p.m. UTC | #1
On Tue, Apr 22, 2014 at 02:41:16PM -0500, Rob Herring wrote:
> From: Rob Herring <robh@kernel.org>
> 
> Multi-platform support implies all these options are already selected and
> individual platforms don't need to select them.

Hi Rob

Does this break mvebu_v7_defconfig?

     Andrew

> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
>  arch/arm/mach-mvebu/Kconfig | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 3f73eec..bfc5af1 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -3,7 +3,6 @@ config ARCH_MVEBU
>  	select ARCH_SUPPORTS_BIG_ENDIAN
>  	select CLKSRC_MMIO
>  	select GENERIC_IRQ_CHIP
> -	select IRQ_DOMAIN
>  	select PINCTRL
>  	select PLAT_ORION
>  	select MVEBU_MBUS
> @@ -11,7 +10,6 @@ config ARCH_MVEBU
>  	select ARCH_REQUIRE_GPIOLIB
>  	select MIGHT_HAVE_PCI
>  	select PCI_QUIRKS if PCI
> -	select OF_ADDRESS_PCI
>  
>  if ARCH_MVEBU
>  
> @@ -38,7 +36,6 @@ config MACH_ARMADA_375
>  	select ARM_ERRATA_753970
>  	select ARM_GIC
>  	select ARMADA_375_CLK
> -	select CPU_V7
>  	select MACH_MVEBU_V7
>  	select PINCTRL_ARMADA_375
>  	help
> @@ -51,7 +48,6 @@ config MACH_ARMADA_38X
>  	select ARM_ERRATA_753970
>  	select ARM_GIC
>  	select ARMADA_38X_CLK
> -	select CPU_V7
>  	select MACH_MVEBU_V7
>  	select PINCTRL_ARMADA_38X
>  	help
> @@ -86,13 +82,11 @@ config MACH_KIRKWOOD
>  	select ARCH_REQUIRE_GPIOLIB
>  	select CPU_FEROCEON
>  	select KIRKWOOD_CLK
> -	select OF_IRQ
>  	select ORION_IRQCHIP
>  	select ORION_TIMER
>  	select PCI
>  	select PCI_QUIRKS
>  	select PINCTRL_KIRKWOOD
> -	select USE_OF
>  	help
>  	  Say 'Y' here if you want your kernel to support boards based
>  	  on the Marvell Kirkwood device tree.
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Rob Herring April 22, 2014, 9:23 p.m. UTC | #2
On Tue, Apr 22, 2014 at 3:58 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> On Tue, Apr 22, 2014 at 02:41:16PM -0500, Rob Herring wrote:
>> From: Rob Herring <robh@kernel.org>
>>
>> Multi-platform support implies all these options are already selected and
>> individual platforms don't need to select them.
>
> Hi Rob
>
> Does this break mvebu_v7_defconfig?

No, it should all be redundant selects.

Rob

>
>      Andrew
>
>>
>> Signed-off-by: Rob Herring <robh@kernel.org>
>> Cc: Jason Cooper <jason@lakedaemon.net>
>> Cc: Andrew Lunn <andrew@lunn.ch>
>> Cc: Gregory Clement <gregory.clement@free-electrons.com>
>> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> ---
>>  arch/arm/mach-mvebu/Kconfig | 6 ------
>>  1 file changed, 6 deletions(-)
>>
>> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
>> index 3f73eec..bfc5af1 100644
>> --- a/arch/arm/mach-mvebu/Kconfig
>> +++ b/arch/arm/mach-mvebu/Kconfig
>> @@ -3,7 +3,6 @@ config ARCH_MVEBU
>>       select ARCH_SUPPORTS_BIG_ENDIAN
>>       select CLKSRC_MMIO
>>       select GENERIC_IRQ_CHIP
>> -     select IRQ_DOMAIN
>>       select PINCTRL
>>       select PLAT_ORION
>>       select MVEBU_MBUS
>> @@ -11,7 +10,6 @@ config ARCH_MVEBU
>>       select ARCH_REQUIRE_GPIOLIB
>>       select MIGHT_HAVE_PCI
>>       select PCI_QUIRKS if PCI
>> -     select OF_ADDRESS_PCI
>>
>>  if ARCH_MVEBU
>>
>> @@ -38,7 +36,6 @@ config MACH_ARMADA_375
>>       select ARM_ERRATA_753970
>>       select ARM_GIC
>>       select ARMADA_375_CLK
>> -     select CPU_V7
>>       select MACH_MVEBU_V7
>>       select PINCTRL_ARMADA_375
>>       help
>> @@ -51,7 +48,6 @@ config MACH_ARMADA_38X
>>       select ARM_ERRATA_753970
>>       select ARM_GIC
>>       select ARMADA_38X_CLK
>> -     select CPU_V7
>>       select MACH_MVEBU_V7
>>       select PINCTRL_ARMADA_38X
>>       help
>> @@ -86,13 +82,11 @@ config MACH_KIRKWOOD
>>       select ARCH_REQUIRE_GPIOLIB
>>       select CPU_FEROCEON
>>       select KIRKWOOD_CLK
>> -     select OF_IRQ
>>       select ORION_IRQCHIP
>>       select ORION_TIMER
>>       select PCI
>>       select PCI_QUIRKS
>>       select PINCTRL_KIRKWOOD
>> -     select USE_OF
>>       help
>>         Say 'Y' here if you want your kernel to support boards based
>>         on the Marvell Kirkwood device tree.
>> --
>> 1.9.1
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Olof Johansson May 5, 2014, 4:55 a.m. UTC | #3
On Tue, Apr 22, 2014 at 02:41:16PM -0500, Rob Herring wrote:
> From: Rob Herring <robh@kernel.org>
> 
> Multi-platform support implies all these options are already selected and
> individual platforms don't need to select them.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

What's this based on? It doesn't apply to 3.15-rc4.


-Olof
Olof Johansson May 5, 2014, 9:22 p.m. UTC | #4
On Mon, May 05, 2014 at 09:42:43AM -0500, Rob Herring wrote:
> On Sun, May 4, 2014 at 11:55 PM, Olof Johansson <olof@lixom.net> wrote:
> > On Tue, Apr 22, 2014 at 02:41:16PM -0500, Rob Herring wrote:
> >> From: Rob Herring <robh@kernel.org>
> >>
> >> Multi-platform support implies all these options are already selected and
> >> individual platforms don't need to select them.
> >>
> >> Signed-off-by: Rob Herring <robh@kernel.org>
> >> Cc: Jason Cooper <jason@lakedaemon.net>
> >> Cc: Andrew Lunn <andrew@lunn.ch>
> >> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> >> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> >
> > What's this based on? It doesn't apply to 3.15-rc4.
> 
> v3.15-rc2. That's strange because there are no other changes since
> rc2. Here's a pull request instead.

Hm, I wonder if I had typoed v3.15 vs v3.14 on the base branch. Anyway:

> 
> Rob
> 
> The following changes since commit a798c10faf62a505d24e5f6213fbaf904a39623f:
> 
>   Linux 3.15-rc2 (2014-04-20 11:08:50 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
> tags/kconfig-cleanups
> 

Merged. Thanks!


-Olof
Ezequiel Garcia June 9, 2014, 6:43 p.m. UTC | #5
Hi Rob,

On 22 Apr 02:41 PM, Rob Herring wrote:
> @@ -11,7 +10,6 @@ config ARCH_MVEBU
>  	select ARCH_REQUIRE_GPIOLIB
>  	select MIGHT_HAVE_PCI
>  	select PCI_QUIRKS if PCI
> -	select OF_ADDRESS_PCI
>  

We needed that one, as Gregory introduced it specifically so we could select it
without selecting PCI.

I'll cook a patch right away, sorry for not seeing this earlier!
Rob Herring June 9, 2014, 7 p.m. UTC | #6
On Mon, Jun 9, 2014 at 1:43 PM, Ezequiel Garcia
<ezequiel.garcia@free-electrons.com> wrote:
> Hi Rob,
>
> On 22 Apr 02:41 PM, Rob Herring wrote:
>> @@ -11,7 +10,6 @@ config ARCH_MVEBU
>>       select ARCH_REQUIRE_GPIOLIB
>>       select MIGHT_HAVE_PCI
>>       select PCI_QUIRKS if PCI
>> -     select OF_ADDRESS_PCI
>>
>
> We needed that one, as Gregory introduced it specifically so we could select it
> without selecting PCI.
>
> I'll cook a patch right away, sorry for not seeing this earlier!

What exactly depends on this? It seems strange to have this
dependency. Some !OF compiling changes for PCI functions went in for
3.16 which may help here.

Rob
Ezequiel Garcia June 9, 2014, 7:05 p.m. UTC | #7
On 09 Jun 02:00 PM, Rob Herring wrote:
> On Mon, Jun 9, 2014 at 1:43 PM, Ezequiel Garcia
> <ezequiel.garcia@free-electrons.com> wrote:
> > Hi Rob,
> >
> > On 22 Apr 02:41 PM, Rob Herring wrote:
> >> @@ -11,7 +10,6 @@ config ARCH_MVEBU
> >>       select ARCH_REQUIRE_GPIOLIB
> >>       select MIGHT_HAVE_PCI
> >>       select PCI_QUIRKS if PCI
> >> -     select OF_ADDRESS_PCI
> >>
> >
> > We needed that one, as Gregory introduced it specifically so we could select it
> > without selecting PCI.
> >
> > I'll cook a patch right away, sorry for not seeing this earlier!
> 
> What exactly depends on this? It seems strange to have this
> dependency. Some !OF compiling changes for PCI functions went in for
> 3.16 which may help here.
> 

See Gregory's commit introducing the option, I think it's very clear:

https://lkml.org/lkml/2014/2/19/615
diff mbox

Patch

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 3f73eec..bfc5af1 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -3,7 +3,6 @@  config ARCH_MVEBU
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
-	select IRQ_DOMAIN
 	select PINCTRL
 	select PLAT_ORION
 	select MVEBU_MBUS
@@ -11,7 +10,6 @@  config ARCH_MVEBU
 	select ARCH_REQUIRE_GPIOLIB
 	select MIGHT_HAVE_PCI
 	select PCI_QUIRKS if PCI
-	select OF_ADDRESS_PCI
 
 if ARCH_MVEBU
 
@@ -38,7 +36,6 @@  config MACH_ARMADA_375
 	select ARM_ERRATA_753970
 	select ARM_GIC
 	select ARMADA_375_CLK
-	select CPU_V7
 	select MACH_MVEBU_V7
 	select PINCTRL_ARMADA_375
 	help
@@ -51,7 +48,6 @@  config MACH_ARMADA_38X
 	select ARM_ERRATA_753970
 	select ARM_GIC
 	select ARMADA_38X_CLK
-	select CPU_V7
 	select MACH_MVEBU_V7
 	select PINCTRL_ARMADA_38X
 	help
@@ -86,13 +82,11 @@  config MACH_KIRKWOOD
 	select ARCH_REQUIRE_GPIOLIB
 	select CPU_FEROCEON
 	select KIRKWOOD_CLK
-	select OF_IRQ
 	select ORION_IRQCHIP
 	select ORION_TIMER
 	select PCI
 	select PCI_QUIRKS
 	select PINCTRL_KIRKWOOD
-	select USE_OF
 	help
 	  Say 'Y' here if you want your kernel to support boards based
 	  on the Marvell Kirkwood device tree.