Merge branch 'remotes/lorenzo/pci/uniphier'

[J-linux.git] / drivers / pci / controller / dwc / Kconfig

diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index 955068867c35e41c5a33930d55d9cfda6e20278a..548c58223868cada23a84085b58f2ac509ffb9e6 100644 (file)
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@ -89,8 +89,8 @@ config PCI_EXYNOS
        select PCIE_DW_HOST
 
 config PCI_IMX6
-       bool "Freescale i.MX6 PCIe controller"
-       depends on SOC_IMX6Q || (ARM && COMPILE_TEST)
+       bool "Freescale i.MX6/7 PCIe controller"
+       depends on SOC_IMX6Q || SOC_IMX7D || (ARM && COMPILE_TEST)
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIE_DW_HOST
 
@@ -193,6 +193,16 @@ config PCIE_HISI_STB
        help
           Say Y here if you want PCIe controller support on HiSilicon STB SoCs
 
+config PCI_MESON
+       bool "MESON PCIe controller"
+       depends on PCI_MSI_IRQ_DOMAIN
+       select PCIE_DW_HOST
+       help
+         Say Y here if you want to enable PCI controller support on Amlogic
+         SoCs. The PCI controller on Amlogic is based on DesignWare hardware
+         and therefore the driver re-uses the DesignWare core functions to
+         implement the driver.
+
 config PCIE_UNIPHIER
        bool "Socionext UniPhier PCIe controllers"
        depends on ARCH_UNIPHIER || COMPILE_TEST