Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 <robh@kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Will Deacon 11 years ago
parent
a52d35c92d
commit
08d38bebb4
7 changed files with 1 additions and 6 deletions
Unified View Show Diff Stats
  1. 1 0
      arch/arm/Kconfig
  2. 0 1
      arch/arm/mach-bcm/Kconfig
  3. 0 1
      arch/arm/mach-cns3xxx/Kconfig
  4. 0 1
      arch/arm/mach-imx/Kconfig
  5. 0 1
      arch/arm/mach-mvebu/Kconfig
  6. 0 1
      arch/arm/mach-shmobile/Kconfig
  7. 0 1
      arch/arm/mach-tegra/Kconfig

+ 1 - 0
arch/arm/Kconfig
View File 

@@ -314,6 +314,7 @@ config ARCH_MULTIPLATFORM
 
 	select CLKSRC_OF
 
 	select CLKSRC_OF
 
 	select COMMON_CLK
 
 	select COMMON_CLK
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
+	select MIGHT_HAVE_PCI
 
 	select MULTI_IRQ_HANDLER
 
 	select MULTI_IRQ_HANDLER
 
 	select SPARSE_IRQ
 
 	select SPARSE_IRQ
 
 	select USE_OF
 
 	select USE_OF

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

@@ -77,7 +77,6 @@ config ARCH_BCM_5301X
 
 	select HAVE_ARM_TWD if SMP
 
 	select HAVE_ARM_TWD if SMP
 
 	select ARM_GLOBAL_TIMER
 
 	select ARM_GLOBAL_TIMER
 
 	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 
 	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 
-	select MIGHT_HAVE_PCI
 
 	help
 
 	help
 
 	  Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.
 
 	  Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.

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

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

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

@@ -796,7 +796,6 @@ config SOC_IMX6Q
 
 	select ARM_ERRATA_764369 if SMP
 
 	select ARM_ERRATA_764369 if SMP
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_ARM_TWD if SMP
 
 	select HAVE_ARM_TWD if SMP
 
-	select MIGHT_HAVE_PCI
 
 	select PCI_DOMAINS if PCI
 
 	select PCI_DOMAINS if PCI
 
 	select PINCTRL_IMX6Q
 
 	select PINCTRL_IMX6Q
 
 	select SOC_IMX6
 
 	select SOC_IMX6

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

@@ -8,7 +8,6 @@ config ARCH_MVEBU
 
 	select MVEBU_MBUS
 
 	select MVEBU_MBUS
 
 	select ZONE_DMA if ARM_LPAE
 
 	select ZONE_DMA if ARM_LPAE
 
 	select ARCH_REQUIRE_GPIOLIB
 
 	select ARCH_REQUIRE_GPIOLIB
 
-	select MIGHT_HAVE_PCI
 
 	select PCI_QUIRKS if PCI
 
 	select PCI_QUIRKS if PCI
 
 
 
 if ARCH_MVEBU
 
 if ARCH_MVEBU

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

@@ -8,7 +8,6 @@ config ARCH_SHMOBILE_MULTI
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_ARM_TWD if SMP
 
 	select HAVE_ARM_TWD if SMP
 
 	select ARM_GIC
 
 	select ARM_GIC
 
-	select MIGHT_HAVE_PCI
 
 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 
 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 
 	select NO_IOPORT_MAP
 
 	select NO_IOPORT_MAP
 
 	select PINCTRL
 
 	select PINCTRL

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

@@ -7,7 +7,6 @@ config ARCH_TEGRA
 
 	select CLKSRC_MMIO
 
 	select CLKSRC_MMIO
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_ARM_TWD if SMP
 
 	select HAVE_ARM_TWD if SMP
 
-	select MIGHT_HAVE_PCI
 
 	select PINCTRL
 
 	select PINCTRL
 
 	select ARCH_HAS_RESET_CONTROLLER
 
 	select ARCH_HAS_RESET_CONTROLLER
 
 	select RESET_CONTROLLER
 
 	select RESET_CONTROLLER