From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 5 Nov 2021 16:28:51 +0000 (-0500)
Subject: Merge branch 'pci/host/mt7621'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=83e168d607d6783db5c18203076d3785b20e7f9e;p=linux.git

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
---

83e168d607d6783db5c18203076d3785b20e7f9e
diff --cc drivers/pci/controller/Kconfig
index 5661d4a84832e,985498374bd77..18f1fa4bdf068
--- a/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 f9d40bad932cf,5f3d6a07d145e..37c8663de7fe1
--- a/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/