Merge branches 'pci/demodularize-hosts' and 'pci/host-request-windows' into next

[mirror_ubuntu-artful-kernel.git] / drivers / pci / host / Kconfig

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 80cfe2f0a5805ca6d0615b36106f5ef1db07dd41..a1ef0c06dbb49a5aeb4e46516e5f94f9878d17e9 100644 (file)
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -89,6 +89,7 @@ config PCI_HOST_GENERIC
        bool "Generic PCI host controller"
        depends on (ARM || ARM64) && OF
        select PCI_HOST_COMMON
+       select IRQ_DOMAIN
        help
          Say Y here if you want to support a simple generic PCI host
          controller, such as the one emulated by kvmtool.
@@ -254,4 +255,14 @@ config PCIE_ARMADA_8K
          Designware hardware and therefore the driver re-uses the
          Designware core functions to implement the driver.
 
+config PCIE_ARTPEC6
+       bool "Axis ARTPEC-6 PCIe controller"
+       depends on MACH_ARTPEC6
+       depends on PCI_MSI_IRQ_DOMAIN
+       select PCIE_DW
+       select PCIEPORTBUS
+       help
+         Say Y here to enable PCIe controller support on Axis ARTPEC-6
+         SoCs.  This PCIe controller uses the DesignWare core.
+
 endmenu