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

Commit 0ecda3a0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/kconfig' 

  - remove unnecessary host controller CONFIG_PCIEPORTBUS Kconfig
    selections (Bjorn Helgaas)

* pci/kconfig:
  PCI: Remove host driver Kconfig selection of CONFIG_PCIEPORTBUS

# Conflicts:
#	drivers/pci/dwc/Kconfig
#	drivers/pci/host/Kconfig
parents 73144d77 f3fdfc4a

drivers/pci/dwc/Kconfig

+0 −10
Original line number Original line Diff line number Diff line
@@ -87,21 +87,18 @@ config PCI_EXYNOS 
	bool "Samsung Exynos PCIe controller"

	bool "Samsung Exynos PCIe controller"

	depends on SOC_EXYNOS5440 || COMPILE_TEST

	depends on SOC_EXYNOS5440 || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST





config PCI_IMX6

config PCI_IMX6

	bool "Freescale i.MX6 PCIe controller"

	bool "Freescale i.MX6 PCIe controller"

	depends on SOC_IMX6Q || (ARM && COMPILE_TEST)

	depends on SOC_IMX6Q || (ARM && COMPILE_TEST)

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST





config PCIE_SPEAR13XX

config PCIE_SPEAR13XX

	bool "STMicroelectronics SPEAr PCIe controller"

	bool "STMicroelectronics SPEAr PCIe controller"

	depends on ARCH_SPEAR13XX || COMPILE_TEST

	depends on ARCH_SPEAR13XX || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	help

	help

	  Say Y here if you want PCIe support on SPEAr13XX SoCs.

	  Say Y here if you want PCIe support on SPEAr13XX SoCs.
@@ -110,7 +107,6 @@ config PCI_KEYSTONE 
	bool "TI Keystone PCIe controller"

	bool "TI Keystone PCIe controller"

	depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST)

	depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST)

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	help

	help

	  Say Y here if you want to enable PCI controller support on Keystone

	  Say Y here if you want to enable PCI controller support on Keystone
@@ -131,7 +127,6 @@ config PCI_HISI 
	depends on OF && (ARM64 || COMPILE_TEST)

	depends on OF && (ARM64 || COMPILE_TEST)

	bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"

	bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	select PCI_HOST_COMMON

	select PCI_HOST_COMMON

	help

	help
@@ -142,7 +137,6 @@ config PCIE_QCOM 
	bool "Qualcomm PCIe controller"

	bool "Qualcomm PCIe controller"

	depends on OF && (ARCH_QCOM || COMPILE_TEST)

	depends on OF && (ARCH_QCOM || COMPILE_TEST)

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	help

	help

	  Say Y here to enable PCIe controller support on Qualcomm SoCs. The

	  Say Y here to enable PCIe controller support on Qualcomm SoCs. The
@@ -153,7 +147,6 @@ config PCIE_ARMADA_8K 
	bool "Marvell Armada-8K PCIe controller"

	bool "Marvell Armada-8K PCIe controller"

	depends on ARCH_MVEBU || COMPILE_TEST

	depends on ARCH_MVEBU || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	help

	help

	  Say Y here if you want to enable PCIe controller support on

	  Say Y here if you want to enable PCIe controller support on
@@ -168,7 +161,6 @@ config PCIE_ARTPEC6_HOST 
	bool "Axis ARTPEC-6 PCIe controller Host Mode"

	bool "Axis ARTPEC-6 PCIe controller Host Mode"

	depends on MACH_ARTPEC6 || COMPILE_TEST

	depends on MACH_ARTPEC6 || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	select PCIE_ARTPEC6

	select PCIE_ARTPEC6

	help

	help
@@ -189,7 +181,6 @@ config PCIE_KIRIN 
	depends on OF && (ARM64 || COMPILE_TEST)

	depends on OF && (ARM64 || COMPILE_TEST)

	bool "HiSilicon Kirin series SoCs PCIe controllers"

	bool "HiSilicon Kirin series SoCs PCIe controllers"

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	help

	help

	  Say Y here if you want PCIe controller support

	  Say Y here if you want PCIe controller support
@@ -199,7 +190,6 @@ config PCIE_HISI_STB 
	bool "HiSilicon STB SoCs PCIe controllers"

	bool "HiSilicon STB SoCs PCIe controllers"

	depends on ARCH_HISI || COMPILE_TEST

	depends on ARCH_HISI || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCIE_DW_HOST

	help

	help

          Say Y here if you want PCIe controller support on HiSilicon STB SoCs

          Say Y here if you want PCIe controller support on HiSilicon STB SoCs

drivers/pci/host/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -84,7 +84,6 @@ config PCI_XGENE 
	bool "X-Gene PCIe controller"

	bool "X-Gene PCIe controller"

	depends on ARM64 || COMPILE_TEST

	depends on ARM64 || COMPILE_TEST

	depends on OF || (ACPI && PCI_QUIRKS)

	depends on OF || (ACPI && PCI_QUIRKS)

	select PCIEPORTBUS

	help

	help

	  Say Y here if you want internal PCI support on APM X-Gene SoC.

	  Say Y here if you want internal PCI support on APM X-Gene SoC.

	  There are 5 internal PCIe ports available. Each port is GEN3 capable

	  There are 5 internal PCIe ports available. Each port is GEN3 capable
@@ -211,7 +210,6 @@ config PCIE_MEDIATEK 
	depends on ARCH_MEDIATEK || COMPILE_TEST

	depends on ARCH_MEDIATEK || COMPILE_TEST

	depends on OF

	depends on OF

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	help

	help

	  Say Y here if you want to enable PCIe controller support on

	  Say Y here if you want to enable PCIe controller support on

	  MediaTek SoCs.

	  MediaTek SoCs.