ARM: select PCI_DOMAINS config from ARCH_MULTIPLATFORM

PCI_DOMAINS config should be selected for any SoCs
having more than a single PCIe controller. Without PCI_DOMAINS
config, only one PCIe controller gets registered.

Select PCI_DOMAINS in ARCH_MULTIPLATFORM if PCI is selected, since
it doesn't harm even if a platform has a single PCIe port.
Also remove PCI_DOMAINS being selected from other platform
specific configs.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a6cdfefd7b9b15c99db761df08c3e4e37d2e737f..42f1c87171fe4fc73bc95c3f7d0000aa3961c896 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -336,6 +336,7 @@ config ARCH_MULTIPLATFORM
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
        select MULTI_IRQ_HANDLER
+       select PCI_DOMAINS if PCI
        select SPARSE_IRQ
        select USE_OF
 

diff --git a/arch/arm/mach-axxia/Kconfig b/arch/arm/mach-axxia/Kconfig
index ee2e1314f8cfff8309b3c989a2a5a3c590cd014e..fe627cbcfdc5231adbcde3ce1d3afd5305812a5b 100644 (file)
--- a/arch/arm/mach-axxia/Kconfig
+++ b/arch/arm/mach-axxia/Kconfig
@@ -7,7 +7,6 @@ config ARCH_AXXIA
        select ARM_TIMER_SP804
        select HAVE_ARM_ARCH_TIMER
        select MFD_SYSCON
-       select PCI_DOMAINS if PCI
        select ZONE_DMA
        help
          This enables support for the LSI Axxia devices.

diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig
index eb14a0ff0093848faee161b9f7ae5749e1b3ae86..5fd836be2701fc02744acd91d86e5749fcafea8c 100644 (file)
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
@@ -2,7 +2,6 @@ menuconfig ARCH_CNS3XXX
        bool "Cavium Networks CNS3XXX family"
        depends on ARCH_MULTI_V6
        select ARM_GIC
-       select PCI_DOMAINS if PCI
        help
          Support for Cavium Networks CNS3XXX platform.
 

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index ee8a99ca4ba9621b62b4f8ce38b7f776026c8eb0..18f0c856f290442788965e308c1a7f274feace4b 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -126,7 +126,6 @@ config SOC_EXYNOS5440
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
        select HAVE_ARM_ARCH_TIMER
        select AUTO_ZRELADDR
-       select PCI_DOMAINS if PCI
        select PINCTRL_EXYNOS5440
        select PM_OPP
        help

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 0ac05a03a83de845fef01162cb3682fde536dcb2..9155b639c9aa9bebbfd57cbbbafcb3135706ffb3 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -498,7 +498,6 @@ config SOC_IMX6Q
        select ARM_ERRATA_764369 if SMP
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD
-       select PCI_DOMAINS if PCI
        select PINCTRL_IMX6Q
        select SOC_IMX6
 
@@ -544,7 +543,6 @@ config SOC_LS1021A
        bool "Freescale LS1021A support"
        select ARM_GIC
        select HAVE_ARM_ARCH_TIMER
-       select PCI_DOMAINS if PCI
        select ZONE_DMA if ARM_LPAE
        help
          This enables support for Freescale LS1021A processor.

diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 1507287eafdba05be823c3f49817cbb73b6774b2..24bd64dabdfcd3d3c8818b151da2bf5d322c4a5e 100644 (file)
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -8,7 +8,6 @@ config ARCH_KEYSTONE
        select COMMON_CLK_KEYSTONE
        select ARCH_SUPPORTS_BIG_ENDIAN
        select ZONE_DMA if ARM_LPAE
-       select PCI_DOMAINS if PCI
        select PINCTRL
        help
          Support for boards based on the Texas Instruments Keystone family of

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 4a48c9f5f72537cd95d294d96634a794e0e1fb5e..09817bae455894f7be392b6d8c25ccbecc3bbd52 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -22,7 +22,6 @@ config ARCH_RCAR_GEN2
        select PM_GENERIC_DOMAINS
        select RENESAS_IRQC
        select SYS_SUPPORTS_SH_CMT
-       select PCI_DOMAINS if PCI
 
 config ARCH_RMOBILE
        bool