ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM

PATCH New Will Deacon 2 participants 2 messages May 27, 2014 – May 29, 2014

Subsystems (7)

Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape Tegra architecture support +3 more subsystems

lore

Share & tools

lore

Will Deacon

author

2014-05-27 22:26 UTC #0 lore raw

PATCH 1/1 ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM

When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with PCI-capable devices (e.g. mach-virt with virtio-pci).

This patch allows PCI support to be selected for these SoCs by selecting CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y and removes the individual selections from multi-platform enabled SoCs.

Acked-by Rob Herring <[email protected]>

Signed-off-by Will Deacon <[email protected]>

---

Hi Arnd, Olof, Kevin,

Please can you take this patch via the arm-soc tree for 3.16? It doesn't really fit with the generic PCI host driver that I'll send via Bjorn and it seems OTT to send you a pull request containing just this patch.

Cheers,

Will

 arch/arm/Kconfig               | 1 +
 arch/arm/mach-bcm/Kconfig      | 1 -
 arch/arm/mach-cns3xxx/Kconfig  | 1 -
 arch/arm/mach-imx/Kconfig      | 1 -
 arch/arm/mach-mvebu/Kconfig    | 1 -
 arch/arm/mach-shmobile/Kconfig | 1 -
 arch/arm/mach-tegra/Kconfig    | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)

arch/arm/Kconfig +1 -0

index db3c5414223e..860bea828ac4 100644
@@ -314,6 +314,7 @@ config ARCH_MULTIPLATFORM
 	select CLKSRC_OF
 	select COMMON_CLK
 	select GENERIC_CLOCKEVENTS
+	select MIGHT_HAVE_PCI
 	select MULTI_IRQ_HANDLER
 	select SPARSE_IRQ
 	select USE_OF

arch/arm/mach-bcm/Kconfig +0 -1

index 49c914cd9c7a..764c129b5eee 100644
@@ -55,7 +55,6 @@ config ARCH_BCM_5301X
 	select GENERIC_CLOCKEVENTS
 	select ARM_GLOBAL_TIMER
 	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
-	select MIGHT_HAVE_PCI
 	help
 	  Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.

arch/arm/mach-cns3xxx/Kconfig +0 -1

index dce8decd5d46..66838f42037f 100644
@@ -1,7 +1,6 @@
 config ARCH_CNS3XXX
 	bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
 	select ARM_GIC
-	select MIGHT_HAVE_PCI
 	select PCI_DOMAINS if PCI
 	help
 	  Support for Cavium Networks CNS3XXX platform.

arch/arm/mach-imx/Kconfig +0 -1

index 5740296dc429..50bb546b893a 100644
@@ -796,7 +796,6 @@ config SOC_IMX6Q
 	select ARM_ERRATA_764369 if SMP
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select MIGHT_HAVE_PCI
 	select PCI_DOMAINS if PCI
 	select PINCTRL_IMX6Q
 	select SOC_IMX6

arch/arm/mach-mvebu/Kconfig +0 -1

index 3f73eecbcfb0..120301ebd324 100644
@@ -9,7 +9,6 @@ config ARCH_MVEBU
 	select MVEBU_MBUS
 	select ZONE_DMA if ARM_LPAE
 	select ARCH_REQUIRE_GPIOLIB
-	select MIGHT_HAVE_PCI
 	select PCI_QUIRKS if PCI
 	select OF_ADDRESS_PCI

arch/arm/mach-shmobile/Kconfig +0 -1

index 0f92ba8e7884..905003898913 100644
@@ -8,7 +8,6 @@ config ARCH_SHMOBILE_MULTI
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select ARM_GIC
-	select MIGHT_HAVE_PCI
 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 	select NO_IOPORT_MAP
 	select PINCTRL

arch/arm/mach-tegra/Kconfig +0 -1

index 55b305d51669..e16999e5b735 100644
@@ -7,7 +7,6 @@ config ARCH_TEGRA
 	select CLKSRC_MMIO
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select MIGHT_HAVE_PCI
 	select PINCTRL
 	select ARCH_HAS_RESET_CONTROLLER
 	select RESET_CONTROLLER

Signature · 1 line

1.9.2

Olof Johansson

Applied

2014-05-29 19:43 UTC #1 lore raw

PATCH 1/1 ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM

Quoted 9 lines · Will Deacon

When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with PCI-capable devices (e.g. mach-virt with virtio-pci).
This patch allows PCI support to be selected for these SoCs by selecting CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y and removes the individual selections from multi-platform enabled SoCs.
Acked-by Rob Herring <[email protected]>
Signed-off-by Will Deacon <[email protected]>

Quoted 8 lines

---
Hi Arnd, Olof, Kevin,
Please can you take this patch via the arm-soc tree for 3.16? It doesn't really fit with the generic PCI host driver that I'll send via Bjorn and it seems OTT to send you a pull request containing just this patch.

Thanks, applied to next/cleanup.

-Olof