Skip to contentSkip to conversation

ARM mach Kconfig clean-ups

PATCH New Rob Herring 4 participants 12 messages Apr 22, 2014 – Jun 9, 2014

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

cover ARM mach Kconfig clean-ups

From: Rob Herring <[email protected]>

This is a follow-up to the multi-platform kconfig clean-ups I did for 3.15. This is fixing new things which got introduced in 3.15. For example, the BCM2835 changes appear to have been lost with its move to mach-bcm.

Rob

Rob Herring (3):
ARM: mvebu: clean-up unneeded kconfig selects
ARM: bcm: clean-up unneeded kconfig selects
ARM: qcom: clean-up unneeded kconfig selects

 arch/arm/mach-bcm/Kconfig   | 8 --------
 arch/arm/mach-mvebu/Kconfig | 6 ------
 arch/arm/mach-qcom/Kconfig  | 2 --
 3 files changed, 16 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

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

From: Rob Herring <[email protected]>

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

Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Gregory Clement <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
---
 arch/arm/mach-mvebu/Kconfig | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/mach-mvebu/Kconfig +0 -6
index 3f73eec..bfc5af1 100644
@@ -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.
Signature · 1 line
1.9.1
maintainer
#2 lore raw

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

Quoted 4 lines · Rob Herring

From: Rob Herring <[email protected]>

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

Quoted 68 lines
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Gregory Clement <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
---
 arch/arm/mach-mvebu/Kconfig | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/mach-mvebu/Kconfig +0 -6
index 3f73eec..bfc5af1 100644
@@ -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.
Signature · 7 lines
1.9.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#3 lore raw

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

Quoted 9 lines · Andrew Lunn
Quoted 4 lines · Rob Herring

From: Rob Herring <[email protected]>

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

Quoted 71 lines

Andrew

Quoted 68 lines
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Gregory Clement <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
---
 arch/arm/mach-mvebu/Kconfig | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/mach-mvebu/Kconfig +0 -7
index 3f73eec..bfc5af1 100644
@@ -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 at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

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

In reply to Rob Herring
Quoted 10 lines · Rob Herring

From: Rob Herring <[email protected]>

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

Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Gregory Clement <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>

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

-Olof

#5 lore raw

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

Quoted 6 lines · Olof Johansson
Quoted 5 lines · Rob Herring

From: Rob Herring <[email protected]>

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

Quoted 7 lines
Quoted 5 lines
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Gregory Clement <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>

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.

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

for you to fetch changes up to e7062b101537a0c4f4a8d725321772eb78100074:

ARM: qcom: clean-up unneeded kconfig selects (2014-04-22 14:33:27 -0500)

----------------------------------------------------------------
Several mach kconfig clean-ups of redundant selects

----------------------------------------------------------------
Rob Herring (3):
ARM: mvebu: clean-up unneeded kconfig selects
ARM: bcm: clean-up unneeded kconfig selects
ARM: qcom: clean-up unneeded kconfig selects

 arch/arm/mach-bcm/Kconfig   | 8 --------
 arch/arm/mach-mvebu/Kconfig | 6 ------
 arch/arm/mach-qcom/Kconfig  | 2 --
 3 files changed, 16 deletions(-)
#6 lore raw

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

Quoted 13 lines · Rob Herring
Quoted 12 lines · Olof Johansson
Quoted 10 lines · Rob Herring

From: Rob Herring <[email protected]>

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

Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Gregory Clement <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
Quoted 4 lines
Quoted 1 line

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:

Quoted 12 lines

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

#7 lore raw

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

In reply to Rob Herring

Hi Rob,

arch/arm/mach-mvebu/Kconfig config ARCH_MVEBU · line 13

Quoted 6 lines · Rob Herring
arch/arm/mach-mvebu/Kconfig +0 -1
@@ -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!

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#8 lore raw

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

Quoted 13 lines · Ezequiel Garcia

Hi Rob,

arch/arm/mach-mvebu/Kconfig config ARCH_MVEBU · line 13

Quoted 6 lines · Rob Herring
arch/arm/mach-mvebu/Kconfig +0 -1
@@ -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.

Quoted 1 line

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

#9 lore raw

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

Quoted 15 lines · Rob Herring
Quoted 13 lines · Ezequiel Garcia

Hi Rob,

arch/arm/mach-mvebu/Kconfig config ARCH_MVEBU · line 13

Quoted 6 lines · Rob Herring
arch/arm/mach-mvebu/Kconfig +0 -1
@@ -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.

Quoted 6 lines
Quoted 1 line

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

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#10 lore raw

PATCH 2/3 ARM: bcm: clean-up unneeded kconfig selects

In reply to Rob Herring

From: Rob Herring <[email protected]>

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

Cc Christian Daudt <[email protected]>
Cc Matt Porter <[email protected]>
Cc bcm-kernel-feedback-list at broadcom.com
---
 arch/arm/mach-bcm/Kconfig | 8 --------
 1 file changed, 8 deletions(-)
arch/arm/mach-bcm/Kconfig +0 -8
index 49c914c..9f19636 100644
@@ -11,7 +11,6 @@ menu "Broadcom SoC Selection"
 
 config ARCH_BCM_MOBILE
 	bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
-	depends on MMU
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369 if SMP
@@ -33,10 +32,7 @@ config ARCH_BCM2835
 	select ARM_AMBA
 	select ARM_ERRATA_411920
 	select ARM_TIMER_SP804
-	select CLKDEV_LOOKUP
 	select CLKSRC_OF
-	select CPU_V6
-	select GENERIC_CLOCKEVENTS
 	select PINCTRL
 	select PINCTRL_BCM2835
 	help
@@ -45,14 +41,10 @@ config ARCH_BCM2835
 
 config ARCH_BCM_5301X
 	bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7
-	depends on MMU
 	select ARM_GIC
 	select CACHE_L2X0
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select HAVE_SMP
-	select COMMON_CLK
-	select GENERIC_CLOCKEVENTS
 	select ARM_GLOBAL_TIMER
 	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 	select MIGHT_HAVE_PCI
Signature · 1 line
1.9.1
#11 lore raw

PATCH 3/3 ARM: qcom: clean-up unneeded kconfig selects

In reply to Rob Herring

From: Rob Herring <[email protected]>

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

Cc Kumar Gala <[email protected]>
Cc David Brown <[email protected]>
Cc linux-arm-msm at vger.kernel.org
---
 arch/arm/mach-qcom/Kconfig | 2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-qcom/Kconfig +0 -2
index a028be2..6aa2214 100644
@@ -3,8 +3,6 @@ config ARCH_QCOM
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_GIC
 	select CLKSRC_OF
-	select GENERIC_CLOCKEVENTS
-	select HAVE_SMP
 	select QCOM_SCM if SMP
 	help
 	  Support for Qualcomm's devicetree based systems.
Signature · 1 line
1.9.1