From: Bjorn Helgaas Date: Wed, 6 Jun 2018 21:10:33 +0000 (-0500) Subject: Merge branch 'lorenzo/pci/host/misc' X-Git-Tag: v4.18-rc1~106^2~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5db844eee501224f29bd67d6fea1ad4e3dd6cdde;p=linux.git 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 --- 5db844eee501224f29bd67d6fea1ad4e3dd6cdde diff --cc drivers/pci/dwc/Kconfig index ce9e5a583857,6f2b653146bb..7445de139fb4 --- a/drivers/pci/dwc/Kconfig +++ b/drivers/pci/dwc/Kconfig @@@ -85,21 -65,24 +85,21 @@@ config PCIE_DW_PLAT_E config PCI_EXYNOS bool "Samsung Exynos PCIe controller" - depends on SOC_EXYNOS5440 - depends on PCI + 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 PCI + 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 PCI + depends on ARCH_SPEAR13XX || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@@ -108,7 -91,8 +108,7 @@@ config PCI_KEYSTONE bool "TI Keystone PCIe controller" - depends on ARCH_KEYSTONE - depends on PCI + depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@@ -120,7 -104,8 +120,7 @@@ config PCI_LAYERSCAPE bool "Freescale Layerscape PCIe controller" - depends on OF && (ARM || ARCH_LAYERSCAPE) - depends on PCI + depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select MFD_SYSCON select PCIE_DW_HOST @@@ -128,8 -113,9 +128,8 @@@ 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 depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@@ -140,7 -126,8 +140,7 @@@ config PCIE_QCOM bool "Qualcomm PCIe controller" - depends on ARCH_QCOM && OF - depends on PCI + depends on OF && (ARCH_QCOM || COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@@ -151,7 -138,8 +151,7 @@@ config PCIE_ARMADA_8K bool "Marvell Armada-8K PCIe controller" - depends on ARCH_MVEBU - depends on PCI + depends on ARCH_MVEBU || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST @@@ -166,8 -154,8 +166,8 @@@ config PCIE_ARTPEC 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 && PCI_MSI_IRQ_DOMAIN + depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST select PCIE_ARTPEC6 @@@ -186,9 -174,10 +186,9 @@@ config PCIE_ARTPEC6_E 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 - depends on PCI select PCIEPORTBUS select PCIE_DW_HOST help @@@ -197,7 -186,8 +197,7 @@@ config PCIE_HISI_STB bool "HiSilicon STB SoCs PCIe controllers" - depends on ARCH_HISI + depends on ARCH_HISI || COMPILE_TEST - depends on PCI depends on PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST diff --cc drivers/pci/host/Kconfig index 3d25b35bb5ab,3d180b594ff2..95ff14486ff4 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@@ -5,7 -5,7 +5,8 @@@ 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 @@@ -65,10 -64,9 +65,10 @@@ config PCI_HOST_COMMO 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 help Say Y here if you want to support a simple generic PCI host controller, such as the one emulated by kvmtool.