From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 Apr 2026 17:50:15 +0000 (-0500)
Subject: Merge branch 'pci/controller/dwc-andes-qilai'
X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=d52e0276261c0ad359b2ef8e40fb63bd7afa65bf;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/controller/dwc-andes-qilai'

- Add Andes QiLai SoC PCIe host driver support (Randolph Lin)

* pci/controller/dwc-andes-qilai:
  PCI: qilai: Add Andes QiLai SoC PCIe host driver support
  dt-bindings: PCI: Add Andes QiLai PCIe support

# Conflicts:
#	drivers/pci/controller/dwc/Makefile
---

d52e0276261c0ad359b2ef8e40fb63bd7afa65bf
diff --cc drivers/pci/controller/dwc/Makefile
index 4867f30ab7c3b,9e61458dff00d..6a085befea9b3
--- a/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@@ -5,6 -5,8 +5,7 @@@ obj-$(CONFIG_PCIE_DW_HOST) += pcie-desi
  obj-$(CONFIG_PCIE_DW_EP) += pcie-designware-ep.o
  obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o
  obj-$(CONFIG_PCIE_AMD_MDB) += pcie-amd-mdb.o
+ obj-$(CONFIG_PCIE_ANDES_QILAI) += pcie-andes-qilai.o
 -obj-$(CONFIG_PCIE_BT1) += pcie-bt1.o
  obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o
  obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
  obj-$(CONFIG_PCIE_FU740) += pcie-fu740.o