Merge branch 'pci/host/mt7621'

- Add MediaTek MT7621 SoC PCIe host controller (moved from staging) (Sergio
  Paracuellos)

* pci/host/mt7621:
  MAINTAINERS: Add Sergio Paracuellos as MT7621 PCIe maintainer
  PCI: mt7621: Add MediaTek MT7621 PCIe host controller driver
  dt-bindings: PCI: Add MT7621 SoC PCIe host controller

# Conflicts:
#	drivers/pci/controller/Kconfig
#	drivers/pci/controller/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/controller/Kconfig
index 5661d4a84832ed8df40ebd58fe4e01b0aa91049d,985498374bd77afaa2c629432e740a6e038a1265..18f1fa4bdf0686a1024fc3d3ef4ca53f8af17d46
--- 1/drivers/pci/controller/Kconfig
--- 2/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@@ -312,24 -312,14 +312,32 @@@ config PCIE_HISI_ER
          Say Y here if you want error handling support
          for the PCIe controller's errors on HiSilicon HIP SoCs
  
 +config PCIE_APPLE_MSI_DOORBELL_ADDR
 +      hex
 +      default 0xfffff000
 +      depends on PCIE_APPLE
 +
 +config PCIE_APPLE
 +      tristate "Apple PCIe controller"
 +      depends on ARCH_APPLE || COMPILE_TEST
 +      depends on OF
 +      depends on PCI_MSI_IRQ_DOMAIN
 +      select PCI_HOST_COMMON
 +      help
 +        Say Y here if you want to enable PCIe controller support on Apple
 +        system-on-chips, like the Apple M1. This is required for the USB
 +        type-A ports, Ethernet, Wi-Fi, and Bluetooth.
 +
 +        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"

diff --cc drivers/pci/controller/Makefile
index f9d40bad932cf727727f4ce47c377886544983a2,5f3d6a07d145e78990ec6a5dd6c4df12ad287a9d..37c8663de7fe1ff7c9c948cd39f4b6ce1a912f5b
--- 1/drivers/pci/controller/Makefile
--- 2/drivers/pci/controller/Makefile
+++ b/drivers/pci/controller/Makefile
@@@ -37,7 -37,8 +37,9 @@@ obj-$(CONFIG_VMD) += vmd.
  obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
  obj-$(CONFIG_PCI_LOONGSON) += pci-loongson.o
  obj-$(CONFIG_PCIE_HISI_ERR) += pcie-hisi-error.o
 +obj-$(CONFIG_PCIE_APPLE) += pcie-apple.o
+ obj-$(CONFIG_PCIE_MT7621) += pcie-mt7621.o
+ 
  # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW
  obj-y                         += dwc/
  obj-y                         += mobiveil/