aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-06-06 17:10:33 -0400
committerBjorn Helgaas <bhelgaas@google.com>2018-06-06 17:10:33 -0400
commit5db844eee501224f29bd67d6fea1ad4e3dd6cdde (patch)
treec6d7f7fabaa5d27619d090cf854e8bce5b5cdb57
parentbf79d7d0997abfab40b421a0360adcc4fdbda0a4 (diff)
parent7c3b479eece64caefe1d9230a466c2f1ed587308 (diff)
Merge branch 'lorenzo/pci/host/misc'
- update Layerscape maintainer email addresses (Minghuan Lian) - add COMPILE_TEST to improve build test coverage (Rob Herring) * lorenzo/pci/host/misc: MAINTAINERS: Update Layerscape PCIe driver maintainers list PCI: Improve host drivers compile test coverage # Conflicts: # drivers/pci/dwc/Kconfig
-rw-r--r--MAINTAINERS6
-rw-r--r--drivers/pci/dwc/Kconfig24
-rw-r--r--drivers/pci/host/Kconfig32
3 files changed, 30 insertions, 32 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0a1410d5a621..c789798666bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10711,9 +10711,9 @@ F: Documentation/devicetree/bindings/pci/cdns,*.txt
10711F: drivers/pci/cadence/pcie-cadence* 10711F: drivers/pci/cadence/pcie-cadence*
10712 10712
10713PCI DRIVER FOR FREESCALE LAYERSCAPE 10713PCI DRIVER FOR FREESCALE LAYERSCAPE
10714M: Minghuan Lian <minghuan.Lian@freescale.com> 10714M: Minghuan Lian <minghuan.Lian@nxp.com>
10715M: Mingkai Hu <mingkai.hu@freescale.com> 10715M: Mingkai Hu <mingkai.hu@nxp.com>
10716M: Roy Zang <tie-fei.zang@freescale.com> 10716M: Roy Zang <roy.zang@nxp.com>
10717L: linuxppc-dev@lists.ozlabs.org 10717L: linuxppc-dev@lists.ozlabs.org
10718L: linux-pci@vger.kernel.org 10718L: linux-pci@vger.kernel.org
10719L: linux-arm-kernel@lists.infradead.org 10719L: linux-arm-kernel@lists.infradead.org
diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
index ce9e5a583857..7445de139fb4 100644
--- a/drivers/pci/dwc/Kconfig
+++ b/drivers/pci/dwc/Kconfig
@@ -85,21 +85,21 @@ config PCIE_DW_PLAT_EP
85 85
86config PCI_EXYNOS 86config PCI_EXYNOS
87 bool "Samsung Exynos PCIe controller" 87 bool "Samsung Exynos PCIe controller"
88 depends on SOC_EXYNOS5440 88 depends on SOC_EXYNOS5440 || COMPILE_TEST
89 depends on PCI_MSI_IRQ_DOMAIN 89 depends on PCI_MSI_IRQ_DOMAIN
90 select PCIEPORTBUS 90 select PCIEPORTBUS
91 select PCIE_DW_HOST 91 select PCIE_DW_HOST
92 92
93config PCI_IMX6 93config PCI_IMX6
94 bool "Freescale i.MX6 PCIe controller" 94 bool "Freescale i.MX6 PCIe controller"
95 depends on SOC_IMX6Q 95 depends on SOC_IMX6Q || (ARM && COMPILE_TEST)
96 depends on PCI_MSI_IRQ_DOMAIN 96 depends on PCI_MSI_IRQ_DOMAIN
97 select PCIEPORTBUS 97 select PCIEPORTBUS
98 select PCIE_DW_HOST 98 select PCIE_DW_HOST
99 99
100config PCIE_SPEAR13XX 100config PCIE_SPEAR13XX
101 bool "STMicroelectronics SPEAr PCIe controller" 101 bool "STMicroelectronics SPEAr PCIe controller"
102 depends on ARCH_SPEAR13XX 102 depends on ARCH_SPEAR13XX || COMPILE_TEST
103 depends on PCI_MSI_IRQ_DOMAIN 103 depends on PCI_MSI_IRQ_DOMAIN
104 select PCIEPORTBUS 104 select PCIEPORTBUS
105 select PCIE_DW_HOST 105 select PCIE_DW_HOST
@@ -108,7 +108,7 @@ config PCIE_SPEAR13XX
108 108
109config PCI_KEYSTONE 109config PCI_KEYSTONE
110 bool "TI Keystone PCIe controller" 110 bool "TI Keystone PCIe controller"
111 depends on ARCH_KEYSTONE 111 depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST)
112 depends on PCI_MSI_IRQ_DOMAIN 112 depends on PCI_MSI_IRQ_DOMAIN
113 select PCIEPORTBUS 113 select PCIEPORTBUS
114 select PCIE_DW_HOST 114 select PCIE_DW_HOST
@@ -120,7 +120,7 @@ config PCI_KEYSTONE
120 120
121config PCI_LAYERSCAPE 121config PCI_LAYERSCAPE
122 bool "Freescale Layerscape PCIe controller" 122 bool "Freescale Layerscape PCIe controller"
123 depends on OF && (ARM || ARCH_LAYERSCAPE) 123 depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST)
124 depends on PCI_MSI_IRQ_DOMAIN 124 depends on PCI_MSI_IRQ_DOMAIN
125 select MFD_SYSCON 125 select MFD_SYSCON
126 select PCIE_DW_HOST 126 select PCIE_DW_HOST
@@ -128,7 +128,7 @@ config PCI_LAYERSCAPE
128 Say Y here if you want PCIe controller support on Layerscape SoCs. 128 Say Y here if you want PCIe controller support on Layerscape SoCs.
129 129
130config PCI_HISI 130config PCI_HISI
131 depends on OF && ARM64 131 depends on OF && (ARM64 || COMPILE_TEST)
132 bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers" 132 bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
133 depends on PCI_MSI_IRQ_DOMAIN 133 depends on PCI_MSI_IRQ_DOMAIN
134 select PCIEPORTBUS 134 select PCIEPORTBUS
@@ -140,7 +140,7 @@ config PCI_HISI
140 140
141config PCIE_QCOM 141config PCIE_QCOM
142 bool "Qualcomm PCIe controller" 142 bool "Qualcomm PCIe controller"
143 depends on ARCH_QCOM && OF 143 depends on OF && (ARCH_QCOM || COMPILE_TEST)
144 depends on PCI_MSI_IRQ_DOMAIN 144 depends on PCI_MSI_IRQ_DOMAIN
145 select PCIEPORTBUS 145 select PCIEPORTBUS
146 select PCIE_DW_HOST 146 select PCIE_DW_HOST
@@ -151,7 +151,7 @@ config PCIE_QCOM
151 151
152config PCIE_ARMADA_8K 152config PCIE_ARMADA_8K
153 bool "Marvell Armada-8K PCIe controller" 153 bool "Marvell Armada-8K PCIe controller"
154 depends on ARCH_MVEBU 154 depends on ARCH_MVEBU || COMPILE_TEST
155 depends on PCI_MSI_IRQ_DOMAIN 155 depends on PCI_MSI_IRQ_DOMAIN
156 select PCIEPORTBUS 156 select PCIEPORTBUS
157 select PCIE_DW_HOST 157 select PCIE_DW_HOST
@@ -166,7 +166,7 @@ config PCIE_ARTPEC6
166 166
167config PCIE_ARTPEC6_HOST 167config PCIE_ARTPEC6_HOST
168 bool "Axis ARTPEC-6 PCIe controller Host Mode" 168 bool "Axis ARTPEC-6 PCIe controller Host Mode"
169 depends on MACH_ARTPEC6 169 depends on MACH_ARTPEC6 || COMPILE_TEST
170 depends on PCI_MSI_IRQ_DOMAIN 170 depends on PCI_MSI_IRQ_DOMAIN
171 select PCIEPORTBUS 171 select PCIEPORTBUS
172 select PCIE_DW_HOST 172 select PCIE_DW_HOST
@@ -177,7 +177,7 @@ config PCIE_ARTPEC6_HOST
177 177
178config PCIE_ARTPEC6_EP 178config PCIE_ARTPEC6_EP
179 bool "Axis ARTPEC-6 PCIe controller Endpoint Mode" 179 bool "Axis ARTPEC-6 PCIe controller Endpoint Mode"
180 depends on MACH_ARTPEC6 180 depends on MACH_ARTPEC6 || COMPILE_TEST
181 depends on PCI_ENDPOINT 181 depends on PCI_ENDPOINT
182 select PCIE_DW_EP 182 select PCIE_DW_EP
183 select PCIE_ARTPEC6 183 select PCIE_ARTPEC6
@@ -186,7 +186,7 @@ config PCIE_ARTPEC6_EP
186 endpoint mode. This uses the DesignWare core. 186 endpoint mode. This uses the DesignWare core.
187 187
188config PCIE_KIRIN 188config PCIE_KIRIN
189 depends on OF && ARM64 189 depends on OF && (ARM64 || COMPILE_TEST)
190 bool "HiSilicon Kirin series SoCs PCIe controllers" 190 bool "HiSilicon Kirin series SoCs PCIe controllers"
191 depends on PCI_MSI_IRQ_DOMAIN 191 depends on PCI_MSI_IRQ_DOMAIN
192 select PCIEPORTBUS 192 select PCIEPORTBUS
@@ -197,7 +197,7 @@ config PCIE_KIRIN
197 197
198config PCIE_HISI_STB 198config PCIE_HISI_STB
199 bool "HiSilicon STB SoCs PCIe controllers" 199 bool "HiSilicon STB SoCs PCIe controllers"
200 depends on ARCH_HISI 200 depends on ARCH_HISI || COMPILE_TEST
201 depends on PCI_MSI_IRQ_DOMAIN 201 depends on PCI_MSI_IRQ_DOMAIN
202 select PCIEPORTBUS 202 select PCIEPORTBUS
203 select PCIE_DW_HOST 203 select PCIE_DW_HOST
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 3d25b35bb5ab..95ff14486ff4 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -5,13 +5,14 @@ menu "PCI host controller drivers"
5 5
6config PCI_MVEBU 6config PCI_MVEBU
7 bool "Marvell EBU PCIe controller" 7 bool "Marvell EBU PCIe controller"
8 depends on ARCH_MVEBU || ARCH_DOVE 8 depends on ARCH_MVEBU || ARCH_DOVE || COMPILE_TEST
9 depends on MVEBU_MBUS
9 depends on ARM 10 depends on ARM
10 depends on OF 11 depends on OF
11 12
12config PCI_AARDVARK 13config PCI_AARDVARK
13 bool "Aardvark PCIe controller" 14 bool "Aardvark PCIe controller"
14 depends on ARCH_MVEBU && ARM64 15 depends on (ARCH_MVEBU && ARM64) || COMPILE_TEST
15 depends on OF 16 depends on OF
16 depends on PCI_MSI_IRQ_DOMAIN 17 depends on PCI_MSI_IRQ_DOMAIN
17 help 18 help
@@ -21,7 +22,7 @@ config PCI_AARDVARK
21 22
22config PCIE_XILINX_NWL 23config PCIE_XILINX_NWL
23 bool "NWL PCIe Core" 24 bool "NWL PCIe Core"
24 depends on ARCH_ZYNQMP 25 depends on ARCH_ZYNQMP || COMPILE_TEST
25 depends on PCI_MSI_IRQ_DOMAIN 26 depends on PCI_MSI_IRQ_DOMAIN
26 help 27 help
27 Say 'Y' here if you want kernel support for Xilinx 28 Say 'Y' here if you want kernel support for Xilinx
@@ -32,12 +33,11 @@ config PCIE_XILINX_NWL
32config PCI_FTPCI100 33config PCI_FTPCI100
33 bool "Faraday Technology FTPCI100 PCI controller" 34 bool "Faraday Technology FTPCI100 PCI controller"
34 depends on OF 35 depends on OF
35 depends on ARM
36 default ARCH_GEMINI 36 default ARCH_GEMINI
37 37
38config PCI_TEGRA 38config PCI_TEGRA
39 bool "NVIDIA Tegra PCIe controller" 39 bool "NVIDIA Tegra PCIe controller"
40 depends on ARCH_TEGRA 40 depends on ARCH_TEGRA || COMPILE_TEST
41 depends on PCI_MSI_IRQ_DOMAIN 41 depends on PCI_MSI_IRQ_DOMAIN
42 help 42 help
43 Say Y here if you want support for the PCIe host controller found 43 Say Y here if you want support for the PCIe host controller found
@@ -45,8 +45,8 @@ config PCI_TEGRA
45 45