| From 9d3436e9dcd7ae92bf011bdbba84d65fc45afd81 Mon Sep 17 00:00:00 2001 |
| From: Will Deacon <will.deacon@arm.com> |
| Date: Tue, 27 May 2014 23:26:35 +0100 |
| Subject: 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> |
| (cherry picked from commit 08d38bebb4dcd6414944f8277ea5ea30010664fe) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-bcm/Kconfig |
| arch/arm/mach-cns3xxx/Kconfig |
| arch/arm/mach-imx/Kconfig |
| --- |
| arch/arm/Kconfig | 1 + |
| arch/arm/mach-cns3xxx/Kconfig | 1 - |
| arch/arm/mach-imx/Kconfig | 3 --- |
| arch/arm/mach-mvebu/Kconfig | 1 - |
| arch/arm/mach-shmobile/Kconfig | 1 - |
| arch/arm/mach-tegra/Kconfig | 1 - |
| 6 files changed, 1 insertion(+), 7 deletions(-) |
| |
| diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig |
| index bb7270772b24..69fc8c1ee833 100644 |
| --- a/arch/arm/Kconfig |
| +++ b/arch/arm/Kconfig |
| @@ -312,6 +312,7 @@ config ARCH_MULTIPLATFORM |
| select AUTO_ZRELADDR |
| select COMMON_CLK |
| select GENERIC_CLOCKEVENTS |
| + select MIGHT_HAVE_PCI |
| select MULTI_IRQ_HANDLER |
| select SPARSE_IRQ |
| select USE_OF |
| diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig |
| index c6f58a15c95e..5191e10b3945 100644 |
| --- a/arch/arm/mach-cns3xxx/Kconfig |
| +++ b/arch/arm/mach-cns3xxx/Kconfig |
| @@ -2,7 +2,6 @@ config ARCH_CNS3XXX |
| bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 |
| select ARM_GIC |
| select CPU_V6K |
| - select MIGHT_HAVE_PCI |
| select PCI_DOMAINS if PCI |
| help |
| Support for Cavium Networks CNS3XXX platform. |
| diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig |
| index ff2447389f27..54fc3c5d1862 100644 |
| --- a/arch/arm/mach-imx/Kconfig |
| +++ b/arch/arm/mach-imx/Kconfig |
| @@ -96,7 +96,6 @@ config SOC_IMX25 |
| |
| config SOC_IMX27 |
| bool |
| - select ARCH_HAS_CPUFREQ |
| select ARCH_HAS_OPP |
| select CPU_ARM926T |
| select IMX_HAVE_IOMUX_V1 |
| @@ -122,7 +121,6 @@ config SOC_IMX35 |
| |
| config SOC_IMX5 |
| bool |
| - select ARCH_HAS_CPUFREQ |
| select ARCH_HAS_OPP |
| select ARCH_MXC_IOMUX_V3 |
| select MXC_TZIC |
| @@ -791,7 +789,6 @@ config SOC_IMX6Q |
| select HAVE_IMX_MMDC |
| select HAVE_IMX_SRC |
| select MFD_SYSCON |
| - select MIGHT_HAVE_PCI |
| select PCI_DOMAINS if PCI |
| select PINCTRL_IMX6Q |
| select PL310_ERRATA_588369 if CACHE_PL310 |
| diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig |
| index 875a35263dc3..0451caf88c65 100644 |
| --- a/arch/arm/mach-mvebu/Kconfig |
| +++ b/arch/arm/mach-mvebu/Kconfig |
| @@ -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 |
| |
| if ARCH_MVEBU |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index b50c753482c7..54c9210461c7 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -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 |
| diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig |
| index 92d660f9610f..b3c521eba7a7 100644 |
| --- a/arch/arm/mach-tegra/Kconfig |
| +++ b/arch/arm/mach-tegra/Kconfig |
| @@ -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 |
| -- |
| 2.1.2 |
| |