Commit 2eac9c2d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Masahiro Yamada
Browse files

PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options 



Move the definitions to drivers/pci and let the architectures select
them.  Two small differences to before: PCI_DOMAINS_GENERIC now selects
PCI_DOMAINS, cutting down the churn for modern architectures.  As the
only architectured arm did previously also offer PCI_DOMAINS as a user
visible choice in addition to selecting it from the relevant configs,
this is gone now.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent eb01d42a

arch/alpha/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config ALPHA 
	select ARCH_NO_PREEMPT

	select ARCH_USE_CMPXCHG_LOCKREF

	select FORCE_PCI if !ALPHA_JENSEN

	select PCI_DOMAINS if PCI

	select HAVE_AOUT

	select HAVE_IDE

	select HAVE_OPROFILE
@@ -321,10 +322,6 @@ config ISA_DMA_API 
	bool

	default y



config PCI_DOMAINS

	bool

	default y



config PCI_SYSCALL

	def_bool PCI

arch/arm/Kconfig

+1 −14
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ config ARCH_MULTIPLATFORM 
	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_MULTI_HANDLER

	select HAVE_PCI

	select PCI_DOMAINS if PCI

	select PCI_DOMAINS_GENERIC if PCI

	select SPARSE_IRQ

	select USE_OF
@@ -1227,19 +1227,6 @@ config ISA_DMA 
config ISA_DMA_API

	bool



config PCI_DOMAINS

	bool "Support for multiple PCI domains"

	depends on PCI

	help

	  Enable PCI domains kernel management. Say Y if your machine

	  has a PCI bus hierarchy that requires more than one PCI

	  domain (aka segment) to be correctly managed. Say N otherwise.



	  If you don't know what to do here, say N.



config PCI_DOMAINS_GENERIC

	def_bool PCI_DOMAINS



config PCI_NANOENGINE

	bool "BSE nanoEngine PCI support"

	depends on SA1100_NANOENGINE

arch/arm/mach-bcm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ config ARCH_BCM_IPROC 
	select GPIOLIB

	select ARM_AMBA

	select PINCTRL

	select PCI_DOMAINS if PCI

	select PCI_DOMAINS_GENERIC if PCI

	help

	  This enables support for systems based on Broadcom IPROC architected SoCs.

	  The IPROC complex contains one or more ARM CPUs along with common

arch/arm/mach-socfpga/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ menuconfig ARCH_SOCFPGA 
	select HAVE_ARM_SCU

	select HAVE_ARM_TWD if SMP

	select MFD_SYSCON

	select PCI_DOMAINS if PCI

	select PCI_DOMAINS_GENERIC if PCI



if ARCH_SOCFPGA

config SOCFPGA_SUSPEND

arch/arm64/Kconfig

+1 −6
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ config ARM64 
	select OF

	select OF_EARLY_FLATTREE

	select OF_RESERVED_MEM

	select PCI_DOMAINS_GENERIC if PCI

	select PCI_ECAM if ACPI

	select POWER_RESET

	select POWER_SUPPLY
@@ -288,12 +289,6 @@ config ARCH_PROC_KCORE_TEXT 


source "arch/arm64/Kconfig.platforms"



config PCI_DOMAINS

	def_bool PCI



config PCI_DOMAINS_GENERIC

	def_bool PCI



config PCI_SYSCALL

	def_bool PCI

CRA Git | Maintained and supported by SUSTech CRA and CCSE