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

Commit 5db844ee authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents bf79d7d0 7c3b479e

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -10711,9 +10711,9 @@ F: Documentation/devicetree/bindings/pci/cdns,*.txt 
F:	drivers/pci/cadence/pcie-cadence*



PCI DRIVER FOR FREESCALE LAYERSCAPE

M:	Minghuan Lian <minghuan.Lian@freescale.com>

M:	Mingkai Hu <mingkai.hu@freescale.com>

M:	Roy Zang <tie-fei.zang@freescale.com>

M:	Minghuan Lian <minghuan.Lian@nxp.com>

M:	Mingkai Hu <mingkai.hu@nxp.com>

M:	Roy Zang <roy.zang@nxp.com>

L:	linuxppc-dev@lists.ozlabs.org

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

drivers/pci/dwc/Kconfig

+12 −12
Original line number Diff line number Diff line
@@ -85,21 +85,21 @@ config PCIE_DW_PLAT_EP 


config PCI_EXYNOS

	bool "Samsung Exynos PCIe controller"

	depends on SOC_EXYNOS5440

	depends on SOC_EXYNOS5440 || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST



config PCI_IMX6

	bool "Freescale i.MX6 PCIe controller"

	depends on SOC_IMX6Q

	depends on SOC_IMX6Q || (ARM && COMPILE_TEST)

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST



config PCIE_SPEAR13XX

	bool "STMicroelectronics SPEAr PCIe controller"

	depends on ARCH_SPEAR13XX

	depends on ARCH_SPEAR13XX || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST
@@ -108,7 +108,7 @@ config PCIE_SPEAR13XX 


config PCI_KEYSTONE

	bool "TI Keystone PCIe controller"

	depends on ARCH_KEYSTONE

	depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST)

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST
@@ -120,7 +120,7 @@ config PCI_KEYSTONE 


config PCI_LAYERSCAPE

	bool "Freescale Layerscape PCIe controller"

	depends on OF && (ARM || ARCH_LAYERSCAPE)

	depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST)

	depends on PCI_MSI_IRQ_DOMAIN

	select MFD_SYSCON

	select PCIE_DW_HOST
@@ -128,7 +128,7 @@ config PCI_LAYERSCAPE 
	  Say Y here if you want PCIe controller support on Layerscape SoCs.



config PCI_HISI

	depends on OF && ARM64

	depends on OF && (ARM64 || COMPILE_TEST)

	bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS
@@ -140,7 +140,7 @@ config PCI_HISI 


config PCIE_QCOM

	bool "Qualcomm PCIe controller"

	depends on ARCH_QCOM && OF

	depends on OF && (ARCH_QCOM || COMPILE_TEST)

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST
@@ -151,7 +151,7 @@ config PCIE_QCOM 


config PCIE_ARMADA_8K

	bool "Marvell Armada-8K PCIe controller"

	depends on ARCH_MVEBU

	depends on ARCH_MVEBU || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST
@@ -166,7 +166,7 @@ config PCIE_ARTPEC6 


config PCIE_ARTPEC6_HOST

	bool "Axis ARTPEC-6 PCIe controller Host Mode"

	depends on MACH_ARTPEC6

	depends on MACH_ARTPEC6 || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST
@@ -177,7 +177,7 @@ config PCIE_ARTPEC6_HOST 


config PCIE_ARTPEC6_EP

	bool "Axis ARTPEC-6 PCIe controller Endpoint Mode"

	depends on MACH_ARTPEC6

	depends on MACH_ARTPEC6 || COMPILE_TEST

	depends on PCI_ENDPOINT

	select PCIE_DW_EP

	select PCIE_ARTPEC6
@@ -186,7 +186,7 @@ config PCIE_ARTPEC6_EP 
	  endpoint mode. This uses the DesignWare core.



config PCIE_KIRIN

	depends on OF && ARM64

	depends on OF && (ARM64 || COMPILE_TEST)

	bool "HiSilicon Kirin series SoCs PCIe controllers"

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS
@@ -197,7 +197,7 @@ config PCIE_KIRIN 


config PCIE_HISI_STB

	bool "HiSilicon STB SoCs PCIe controllers"

	depends on ARCH_HISI

	depends on ARCH_HISI || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

drivers/pci/host/Kconfig

+15 −17
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ menu "PCI host controller drivers" 


config PCI_MVEBU

	bool "Marvell EBU PCIe controller"

	depends on ARCH_MVEBU || ARCH_DOVE

	depends on ARCH_MVEBU || ARCH_DOVE || COMPILE_TEST

	depends on MVEBU_MBUS

	depends on ARM

	depends on OF



config PCI_AARDVARK

	bool "Aardvark PCIe controller"

	depends on ARCH_MVEBU && ARM64

	depends on (ARCH_MVEBU && ARM64) || COMPILE_TEST

	depends on OF

	depends on PCI_MSI_IRQ_DOMAIN

	help
@@ -21,7 +22,7 @@ config PCI_AARDVARK 


config PCIE_XILINX_NWL

	bool "NWL PCIe Core"

	depends on ARCH_ZYNQMP

	depends on ARCH_ZYNQMP || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	help

	 Say 'Y' here if you want kernel support for Xilinx
@@ -32,12 +33,11 @@ config PCIE_XILINX_NWL 
config PCI_FTPCI100

	bool "Faraday Technology FTPCI100 PCI controller"

	depends on OF

	depends on ARM

	default ARCH_GEMINI



config PCI_TEGRA

	bool "NVIDIA Tegra PCIe controller"

	depends on ARCH_TEGRA

	depends on ARCH_TEGRA || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	help

	  Say Y here if you want support for the PCIe host controller found
@@ -45,8 +45,8 @@ config PCI_TEGRA 


config PCI_RCAR_GEN2

	bool "Renesas R-Car Gen2 Internal PCI controller"

	depends on ARM

	depends on ARCH_RENESAS || COMPILE_TEST

	depends on ARM

	help

	  Say Y here if you want internal PCI support on R-Car Gen2 SoC.

	  There are 3 internal PCI controllers available with a single
@@ -54,7 +54,7 @@ config PCI_RCAR_GEN2 


config PCIE_RCAR

	bool "Renesas R-Car PCIe controller"

	depends on ARCH_RENESAS || (ARM && COMPILE_TEST)

	depends on ARCH_RENESAS || COMPILE_TEST

	depends on PCI_MSI_IRQ_DOMAIN

	help

	  Say Y here if you want PCIe controller support on R-Car SoCs.
@@ -65,7 +65,7 @@ config PCI_HOST_COMMON 


config PCI_HOST_GENERIC

	bool "Generic PCI host controller"

	depends on (ARM || ARM64) && OF

	depends on OF

	select PCI_HOST_COMMON

	select IRQ_DOMAIN

	select PCI_DOMAINS
@@ -75,14 +75,14 @@ config PCI_HOST_GENERIC 


config PCIE_XILINX

	bool "Xilinx AXI PCIe host bridge support"

	depends on ARCH_ZYNQ || MICROBLAZE || (MIPS && PCI_DRIVERS_GENERIC)

	depends on ARCH_ZYNQ || MICROBLAZE || (MIPS && PCI_DRIVERS_GENERIC) || COMPILE_TEST

	help

	  Say 'Y' here if you want kernel to support the Xilinx AXI PCIe

	  Host Bridge driver.



config PCI_XGENE

	bool "X-Gene PCIe controller"

	depends on ARM64

	depends on ARM64 || COMPILE_TEST

	depends on OF || (ACPI && PCI_QUIRKS)

	select PCIEPORTBUS

	help
@@ -102,7 +102,7 @@ config PCI_XGENE_MSI 
config PCI_V3_SEMI

	bool "V3 Semiconductor PCI controller"

	depends on OF

	depends on ARM

	depends on ARM || COMPILE_TEST

	default ARCH_INTEGRATOR_AP



config PCI_VERSATILE
@@ -148,8 +148,7 @@ config PCIE_IPROC_MSI 


config PCIE_ALTERA

	bool "Altera PCIe controller"

	depends on ARM || NIOS2

	depends on OF_PCI

	depends on ARM || NIOS2 || COMPILE_TEST

	select PCI_DOMAINS

	help

	  Say Y here if you want to enable PCIe controller support on Altera
@@ -165,7 +164,7 @@ config PCIE_ALTERA_MSI 


config PCI_HOST_THUNDER_PEM

	bool "Cavium Thunder PCIe controller to off-chip devices"

	depends on ARM64

	depends on ARM64 || COMPILE_TEST

	depends on OF || (ACPI && PCI_QUIRKS)

	select PCI_HOST_COMMON

	help
@@ -173,7 +172,7 @@ config PCI_HOST_THUNDER_PEM 


config PCI_HOST_THUNDER_ECAM

	bool "Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon"

	depends on ARM64

	depends on ARM64 || COMPILE_TEST

	depends on OF || (ACPI && PCI_QUIRKS)

	select PCI_HOST_COMMON

	help
@@ -192,9 +191,8 @@ config PCIE_ROCKCHIP 


config PCIE_MEDIATEK

	bool "MediaTek PCIe controller"

	depends on (ARM || ARM64) && (ARCH_MEDIATEK || COMPILE_TEST)

	depends on ARCH_MEDIATEK || COMPILE_TEST

	depends on OF

	depends on PCI

	select PCIEPORTBUS

	help

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