From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 Apr 2026 17:50:22 +0000 (-0500)
Subject: Merge branch 'pci/controller/dwc-eswin'
X-Git-Tag: v7.1-rc1~151^2~10
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=927e9d9d4e792159268310716a87bd56c5fcc810;p=thirdparty%2Flinux.git

Merge branch 'pci/controller/dwc-eswin'

- Add DT binding and driver for ESWIN PCIe Root Complex (Senchuan Zhang)

* pci/controller/dwc-eswin:
  PCI: eswin: Add ESWIN PCIe Root Complex driver
  dt-bindings: PCI: eswin: Add ESWIN PCIe Root Complex

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

927e9d9d4e792159268310716a87bd56c5fcc810
diff --cc drivers/pci/controller/dwc/Kconfig
index 9f9037aa2207e,1b7ecd555e864..0244e80eaf968
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@@ -95,6 -84,25 +95,16 @@@ config PCIE_ARTPEC6_E
  	  Enables support for the PCIe controller in the ARTPEC-6 SoC to work in
  	  endpoint mode. This uses the DesignWare core.
  
 -config PCIE_BT1
 -	tristate "Baikal-T1 PCIe controller"
 -	depends on MIPS_BAIKAL_T1 || COMPILE_TEST
 -	depends on PCI_MSI
 -	select PCIE_DW_HOST
 -	help
 -	  Enables support for the PCIe controller in the Baikal-T1 SoC to work
 -	  in host mode. It's based on the Synopsys DWC PCIe v4.60a IP-core.
 -
+ config PCIE_ESWIN
+ 	tristate "ESWIN PCIe controller"
+ 	depends on ARCH_ESWIN || COMPILE_TEST
+ 	depends on PCI_MSI
+ 	select PCIE_DW_HOST
+ 	help
+ 	  Say Y here if you want PCIe controller support for the ESWIN SoCs.
+ 	  The PCIe controller in ESWIN SoCs is based on DesignWare hardware, and
+ 	  works only in host mode.
+ 
  config PCI_IMX6
  	bool
  
diff --cc drivers/pci/controller/dwc/Makefile
index 6a085befea9b3,83558e0f2a613..7177451db8aa1
--- a/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@@ -5,7 -5,8 +5,8 @@@ 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_BT1) += pcie-bt1.o
 +obj-$(CONFIG_PCIE_ANDES_QILAI) += pcie-andes-qilai.o
+ obj-$(CONFIG_PCIE_ESWIN) += pcie-eswin.o
  obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o
  obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
  obj-$(CONFIG_PCIE_FU740) += pcie-fu740.o