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

PCI: consolidate PCI config entry in drivers/pci 



There is no good reason to duplicate the PCI menu in every architecture.
Instead provide a selectable HAVE_PCI symbol that indicates availability
of PCI support, and a FORCE_PCI symbol to for PCI on and the handle the
rest in drivers/pci.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPalmer Dabbelt <palmer@sifive.com>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 437f2b8c

arch/alpha/Kconfig

+2 −12
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ config ALPHA 
	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_NO_PREEMPT

	select ARCH_NO_PREEMPT

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_CMPXCHG_LOCKREF

	select FORCE_PCI if !ALPHA_JENSEN

	select HAVE_AOUT

	select HAVE_AOUT

	select HAVE_IDE

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_OPROFILE
@@ -15,6 +16,7 @@ config ALPHA 
	select NEED_SG_DMA_LENGTH

	select NEED_SG_DMA_LENGTH

	select VIRT_TO_BUS

	select VIRT_TO_BUS

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_PROBE

	select GENERIC_PCI_IOMAP if PCI

	select AUTO_IRQ_AFFINITY if SMP

	select AUTO_IRQ_AFFINITY if SMP

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

	select ARCH_WANT_IPC_PARSE_VERSION

	select ARCH_WANT_IPC_PARSE_VERSION
@@ -319,17 +321,6 @@ config ISA_DMA_API 
	bool

	bool

	default y

	default y





config PCI

	bool

	depends on !ALPHA_JENSEN

	select GENERIC_PCI_IOMAP

	default y

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

	  your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or

	  VESA. If you have PCI, say Y, otherwise N.



config PCI_DOMAINS

config PCI_DOMAINS

	bool

	bool

	default y

	default y
@@ -681,7 +672,6 @@ config HZ 
	default 1200 if HZ_1200

	default 1200 if HZ_1200

	default 1024

	default 1024





source "drivers/pci/Kconfig"

source "drivers/eisa/Kconfig"

source "drivers/eisa/Kconfig"





source "drivers/pcmcia/Kconfig"

source "drivers/pcmcia/Kconfig"

arch/arc/Kconfig

+0 −20
Original line number Original line Diff line number Diff line
@@ -51,9 +51,6 @@ config ARC 
config ARCH_HAS_CACHE_LINE_SIZE

config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y

	def_bool y





config MIGHT_HAVE_PCI

	bool



config TRACE_IRQFLAGS_SUPPORT

config TRACE_IRQFLAGS_SUPPORT

	def_bool y

	def_bool y
@@ -553,24 +550,7 @@ config FORCE_MAX_ZONEORDER 
	default "12" if ARC_HUGEPAGE_16M

	default "12" if ARC_HUGEPAGE_16M

	default "11"

	default "11"





menu "Bus Support"



config PCI

	bool "PCI support" if MIGHT_HAVE_PCI

	help

	  PCI is the name of a bus system, i.e., the way the CPU talks to

	  the other stuff inside your box.  Find out if your board/platform

	  has PCI.



	  Note: PCIe support for Synopsys Device will be available only

	  when HAPS DX is configured with PCIe RC bitmap. If you have PCI,

	  say Y, otherwise N.



config PCI_SYSCALL

config PCI_SYSCALL

	def_bool PCI

	def_bool PCI





source "drivers/pci/Kconfig"



endmenu



source "kernel/power/Kconfig"
 
source "kernel/power/Kconfig"

arch/arc/plat-axs10x/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ menuconfig ARC_PLAT_AXS10X 
	select DW_APB_ICTL

	select DW_APB_ICTL

	select GPIO_DWAPB

	select GPIO_DWAPB

	select OF_GPIO

	select OF_GPIO

	select MIGHT_HAVE_PCI

	select HAVE_PCI

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_CHIP

	select GPIOLIB

	select GPIOLIB

	select AXS101 if ISA_ARCOMPACT

	select AXS101 if ISA_ARCOMPACT

arch/arc/plat-hsdk/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,4 +11,4 @@ menuconfig ARC_SOC_HSDK 
	select ARC_HAS_ACCL_REGS

	select ARC_HAS_ACCL_REGS

	select CLK_HSDK

	select CLK_HSDK

	select RESET_HSDK

	select RESET_HSDK

	select MIGHT_HAVE_PCI
 
	select HAVE_PCI

arch/arm/Kconfig

+6 −19
Original line number Original line Diff line number Diff line
@@ -147,9 +147,6 @@ config ARM_DMA_IOMMU_ALIGNMENT 




endif

endif





config MIGHT_HAVE_PCI

	bool



config SYS_SUPPORTS_APM_EMULATION

config SYS_SUPPORTS_APM_EMULATION

	bool

	bool
@@ -333,7 +330,7 @@ config ARCH_MULTIPLATFORM 
	select COMMON_CLK

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_MULTI_HANDLER

	select GENERIC_IRQ_MULTI_HANDLER

	select MIGHT_HAVE_PCI

	select HAVE_PCI

	select PCI_DOMAINS if PCI

	select PCI_DOMAINS if PCI

	select SPARSE_IRQ

	select SPARSE_IRQ

	select USE_OF

	select USE_OF
@@ -407,7 +404,7 @@ config ARCH_IOP13XX 
	select CPU_XSC3

	select CPU_XSC3

	select NEED_MACH_MEMORY_H

	select NEED_MACH_MEMORY_H

	select NEED_RET_TO_USER

	select NEED_RET_TO_USER

	select PCI

	select FORCE_PCI

	select PLAT_IOP

	select PLAT_IOP

	select VMSPLIT_1G

	select VMSPLIT_1G

	select SPARSE_IRQ

	select SPARSE_IRQ
@@ -421,7 +418,7 @@ config ARCH_IOP32X 
	select GPIO_IOP

	select GPIO_IOP

	select GPIOLIB

	select GPIOLIB

	select NEED_RET_TO_USER

	select NEED_RET_TO_USER

	select PCI

	select FORCE_PCI

	select PLAT_IOP

	select PLAT_IOP

	help

	help

	  Support for Intel's 80219 and IOP32X (XScale) family of

	  Support for Intel's 80219 and IOP32X (XScale) family of
@@ -434,7 +431,7 @@ config ARCH_IOP33X 
	select GPIO_IOP

	select GPIO_IOP

	select GPIOLIB

	select GPIOLIB

	select NEED_RET_TO_USER

	select NEED_RET_TO_USER

	select PCI

	select FORCE_PCI

	select PLAT_IOP

	select PLAT_IOP

	help

	help

	  Support for Intel's IOP33X (XScale) family of processors.

	  Support for Intel's IOP33X (XScale) family of processors.
@@ -449,7 +446,7 @@ config ARCH_IXP4XX 
	select DMABOUNCE if PCI

	select DMABOUNCE if PCI

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select GPIOLIB

	select GPIOLIB

	select MIGHT_HAVE_PCI

	select HAVE_PCI

	select NEED_MACH_IO_H

	select NEED_MACH_IO_H

	select USB_EHCI_BIG_ENDIAN_DESC

	select USB_EHCI_BIG_ENDIAN_DESC

	select USB_EHCI_BIG_ENDIAN_MMIO

	select USB_EHCI_BIG_ENDIAN_MMIO
@@ -462,7 +459,7 @@ config ARCH_DOVE 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_MULTI_HANDLER

	select GENERIC_IRQ_MULTI_HANDLER

	select GPIOLIB

	select GPIOLIB

	select MIGHT_HAVE_PCI

	select HAVE_PCI

	select MVEBU_MBUS

	select MVEBU_MBUS

	select PINCTRL

	select PINCTRL

	select PINCTRL_DOVE

	select PINCTRL_DOVE
@@ -1230,14 +1227,6 @@ config ISA_DMA 
config ISA_DMA_API

config ISA_DMA_API

	bool

	bool





config PCI

	bool "PCI support" if MIGHT_HAVE_PCI

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

	  your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or

	  VESA. If you have PCI, say Y, otherwise N.



config PCI_DOMAINS

config PCI_DOMAINS

	bool "Support for multiple PCI domains"

	bool "Support for multiple PCI domains"

	depends on PCI

	depends on PCI
@@ -1266,8 +1255,6 @@ config PCI_HOST_ITE8152 
	default y

	default y

	select DMABOUNCE

	select DMABOUNCE





source "drivers/pci/Kconfig"



source "drivers/pcmcia/Kconfig"

source "drivers/pcmcia/Kconfig"





endmenu

endmenu

CRA Git | Maintained and supported by SUSTech CRA and CCSE