Merge tag 'mips_5.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[sfrench/cifs-2.6.git] / drivers / pci / controller / Kconfig

diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index 5661d4a84832ed8df40ebd58fe4e01b0aa91049d..93b1411105373cd21fe4625bca0e339e8f446c66 100644 (file)
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -254,7 +254,7 @@ config PCIE_MEDIATEK_GEN3
          MediaTek SoCs.
 
 config VMD
-       depends on PCI_MSI && X86_64 && SRCU
+       depends on PCI_MSI && X86_64 && SRCU && !UML
        tristate "Intel Volume Management Device Driver"
        help
          Adds support for the Intel Volume Management Device (VMD). VMD is a
@@ -270,7 +270,8 @@ config VMD
 
 config PCIE_BRCMSTB
        tristate "Broadcom Brcmstb PCIe host controller"
-       depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM4908 || COMPILE_TEST
+       depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM4908 || \
+                  BMIPS_GENERIC || COMPILE_TEST
        depends on OF
        depends on PCI_MSI_IRQ_DOMAIN
        default ARCH_BRCMSTB
@@ -330,6 +331,14 @@ config PCIE_APPLE
 
          If unsure, say Y if you have an Apple Silicon system.
 
+config PCIE_MT7621
+       tristate "MediaTek MT7621 PCIe Controller"
+       depends on (RALINK && SOC_MT7621) || (MIPS && COMPILE_TEST)
+       select PHY_MT7621_PCI
+       default SOC_MT7621
+       help
+         This selects a driver for the MediaTek MT7621 PCIe Controller.
+
 source "drivers/pci/controller/dwc/Kconfig"
 source "drivers/pci/controller/mobiveil/Kconfig"
 source "drivers/pci/controller/cadence/Kconfig"