aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-06-06 17:10:49 -0400
committerBjorn Helgaas <bhelgaas@google.com>2018-06-06 17:10:49 -0400
commit0ecda3a087462eb89c1d9227deea998d8cd014e8 (patch)
treedf588bfe9c79c700639c8cc3addbc9d808a9a165 /drivers/pci
parent73144d77cb87d60b4bcab6992a62d6787b09dcf0 (diff)
parentf3fdfc4ac3a26865e84627a7fe08a906081e5abc (diff)
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
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/dwc/Kconfig10
-rw-r--r--drivers/pci/host/Kconfig2
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
index 7445de139fb4..16f52c626b4b 100644
--- a/drivers/pci/dwc/Kconfig
+++ b/drivers/pci/dwc/Kconfig
@@ -87,21 +87,18 @@ config PCI_EXYNOS
87 bool "Samsung Exynos PCIe controller" 87 bool "Samsung Exynos PCIe controller"
88 depends on SOC_EXYNOS5440 || COMPILE_TEST 88 depends on SOC_EXYNOS5440 || COMPILE_TEST
89 depends on PCI_MSI_IRQ_DOMAIN 89 depends on PCI_MSI_IRQ_DOMAIN
90 select PCIEPORTBUS
91 select PCIE_DW_HOST 90 select PCIE_DW_HOST
92 91
93config PCI_IMX6 92config PCI_IMX6
94 bool "Freescale i.MX6 PCIe controller" 93 bool "Freescale i.MX6 PCIe controller"
95 depends on SOC_IMX6Q || (ARM && COMPILE_TEST) 94 depends on SOC_IMX6Q || (ARM && COMPILE_TEST)
96 depends on PCI_MSI_IRQ_DOMAIN 95 depends on PCI_MSI_IRQ_DOMAIN
97 select PCIEPORTBUS
98 select PCIE_DW_HOST 96 select PCIE_DW_HOST
99 97
100config PCIE_SPEAR13XX 98config PCIE_SPEAR13XX
101 bool "STMicroelectronics SPEAr PCIe controller" 99 bool "STMicroelectronics SPEAr PCIe controller"
102 depends on ARCH_SPEAR13XX || COMPILE_TEST 100 depends on ARCH_SPEAR13XX || COMPILE_TEST
103 depends on PCI_MSI_IRQ_DOMAIN 101 depends on PCI_MSI_IRQ_DOMAIN
104 select PCIEPORTBUS
105 select PCIE_DW_HOST 102 select PCIE_DW_HOST
106 help 103 help
107 Say Y here if you want PCIe support on SPEAr13XX SoCs. 104 Say Y here if you want PCIe support on SPEAr13XX SoCs.
@@ -110,7 +107,6 @@ config PCI_KEYSTONE
110 bool "TI Keystone PCIe controller" 107 bool "TI Keystone PCIe controller"
111 depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST) 108 depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST)
112 depends on PCI_MSI_IRQ_DOMAIN 109 depends on PCI_MSI_IRQ_DOMAIN
113 select PCIEPORTBUS
114 select PCIE_DW_HOST 110 select PCIE_DW_HOST
115 help 111 help
116 Say Y here if you want to enable PCI controller support on Keystone 112 Say Y here if you want to enable PCI controller support on Keystone
@@ -131,7 +127,6 @@ config PCI_HISI
131 depends on OF && (ARM64 || COMPILE_TEST) 127 depends on OF && (ARM64 || COMPILE_TEST)
132 bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers" 128 bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
133 depends on PCI_MSI_IRQ_DOMAIN 129 depends on PCI_MSI_IRQ_DOMAIN
134 select PCIEPORTBUS
135 select PCIE_DW_HOST 130 select PCIE_DW_HOST
136 select PCI_HOST_COMMON 131 select PCI_HOST_COMMON
137 help 132 help
@@ -142,7 +137,6 @@ config PCIE_QCOM
142 bool "Qualcomm PCIe controller" 137 bool "Qualcomm PCIe controller"
143 depends on OF && (ARCH_QCOM || COMPILE_TEST) 138 depends on OF && (ARCH_QCOM || COMPILE_TEST)
144 depends on PCI_MSI_IRQ_DOMAIN 139 depends on PCI_MSI_IRQ_DOMAIN
145 select PCIEPORTBUS
146 select PCIE_DW_HOST 140 select PCIE_DW_HOST
147 help 141 help
148 Say Y here to enable PCIe controller support on Qualcomm SoCs. The 142 Say Y here to enable PCIe controller support on Qualcomm SoCs. The
@@ -153,7 +147,6 @@ config PCIE_ARMADA_8K
153 bool "Marvell Armada-8K PCIe controller" 147 bool "Marvell Armada-8K PCIe controller"
154 depends on ARCH_MVEBU || COMPILE_TEST 148 depends on ARCH_MVEBU || COMPILE_TEST
155 depends on PCI_MSI_IRQ_DOMAIN 149 depends on PCI_MSI_IRQ_DOMAIN
156 select PCIEPORTBUS
157 select PCIE_DW_HOST 150 select PCIE_DW_HOST
158 help 151 help
159 Say Y here if you want to enable PCIe controller support on 152 Say Y here if you want to enable PCIe controller support on
@@ -168,7 +161,6 @@ config PCIE_ARTPEC6_HOST
168 bool "Axis ARTPEC-6 PCIe controller Host Mode" 161 bool "Axis ARTPEC-6 PCIe controller Host Mode"
169 depends on MACH_ARTPEC6 || COMPILE_TEST 162 depends on MACH_ARTPEC6 || COMPILE_TEST
170 depends on PCI_MSI_IRQ_DOMAIN 163 depends on PCI_MSI_IRQ_DOMAIN
171 select PCIEPORTBUS
172 select PCIE_DW_HOST 164 select PCIE_DW_HOST
173 select PCIE_ARTPEC6 165 select PCIE_ARTPEC6
174 help 166 help
@@ -189,7 +181,6 @@ config PCIE_KIRIN
189 depends on OF && (ARM64 || COMPILE_TEST) 181 depends on OF && (ARM64 || COMPILE_TEST)
190 bool "HiSilicon Kirin series SoCs PCIe controllers" 182 bool "HiSilicon Kirin series SoCs PCIe controllers"
191 depends on PCI_MSI_IRQ_DOMAIN 183 depends on PCI_MSI_IRQ_DOMAIN
192 select PCIEPORTBUS
193 select PCIE_DW_HOST 184 select PCIE_DW_HOST
194 help 185 help
195 Say Y here if you want PCIe controller support 186 Say Y here if you want PCIe controller support
@@ -199,7 +190,6 @@ config PCIE_HISI_STB
199 bool "HiSilicon STB SoCs PCIe controllers" 190 bool "HiSilicon STB SoCs PCIe controllers"
200 depends on ARCH_HISI || COMPILE_TEST 191 depends on ARCH_HISI || COMPILE_TEST
201 depends on PCI_MSI_IRQ_DOMAIN 192 depends on PCI_MSI_IRQ_DOMAIN
202 select PCIEPORTBUS
203 select PCIE_DW_HOST 193 select PCIE_DW_HOST
204 help 194 help
205 Say Y here if you want PCIe controller support on HiSilicon STB SoCs 195 Say Y here if you want PCIe controller support on HiSilicon STB SoCs
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 2593c8373f8f..a96e23bda664 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -84,7 +84,6 @@ config PCI_XGENE
84 bool "X-Gene PCIe controller" 84 bool "X-Gene PCIe controller"
85 depends on ARM64 || COMPILE_TEST 85 depends on ARM64 || COMPILE_TEST
86 depends on OF || (ACPI && PCI_QUIRKS) 86 depends on OF || (ACPI && PCI_QUIRKS)
87 select PCIEPORTBUS
88 help 87 help
89 Say Y here if you want internal PCI support on APM X-Gene SoC. 88 Say Y here if you want internal PCI support on APM X-Gene SoC.
90 There are 5 internal PCIe ports available. Each port is GEN3 capable 89 There are 5 internal PCIe ports available. Each port is GEN3 capable
@@ -211,7 +210,6 @@ config PCIE_MEDIATEK
211 depends on ARCH_MEDIATEK || COMPILE_TEST 210 depends on ARCH_MEDIATEK || COMPILE_TEST
212 depends on OF 211 depends on OF
213 depends on PCI_MSI_IRQ_DOMAIN 212 depends on PCI_MSI_IRQ_DOMAIN
214 select PCIEPORTBUS
215 help 213 help
216 Say Y here if you want to enable PCIe controller support on 214 Say Y here if you want to enable PCIe controller support on
217 MediaTek SoCs. 215 MediaTek SoCs.
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-27 05:00:15 -0400