Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08d38beb authored by Will Deacon's avatar Will Deacon Committed by Olof Johansson
Browse files

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent a52d35c9

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/mach-bcm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -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.

arch/arm/mach-cns3xxx/Kconfig

+0 −1
Original line number Original line Diff line number Diff line 
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.

arch/arm/mach-imx/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/mach-mvebu/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -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