Merge tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[karo-tx-linux.git] / drivers / pci / host / Kconfig

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 1dfb567b3522fca7d34bd86e4ed859f4579f46b6..c132bddc03f380a96a3c0acb5691a44df8fd2fa7 100644 (file)
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -89,11 +89,20 @@ config PCI_XGENE
        depends on ARCH_XGENE
        depends on OF
        select PCIEPORTBUS
+       select PCI_MSI_IRQ_DOMAIN if PCI_MSI
        help
          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
          and have varied lanes from x1 to x8.
 
+config PCI_XGENE_MSI
+       bool "X-Gene v1 PCIe MSI feature"
+       depends on PCI_XGENE && PCI_MSI
+       default y
+       help
+         Say Y here if you want PCIe MSI support for the APM X-Gene v1 SoC.
+         This MSI driver supports 5 PCIe ports on the APM X-Gene v1 SoC.
+
 config PCI_LAYERSCAPE
        bool "Freescale Layerscape PCIe controller"
        depends on OF && ARM
@@ -125,4 +134,15 @@ config PCIE_IPROC_PLATFORM
          Say Y here if you want to use the Broadcom iProc PCIe controller
          through the generic platform bus interface
 
+config PCIE_IPROC_BCMA
+       bool "Broadcom iProc PCIe BCMA bus driver"
+       depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST)
+       select PCIE_IPROC
+       select BCMA
+       select PCI_DOMAINS
+       default ARCH_BCM_5301X
+       help
+         Say Y here if you want to use the Broadcom iProc PCIe controller
+         through the BCMA bus interface
+
 endmenu