From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 3 Dec 2025 20:18:42 +0000 (-0600)
Subject: Merge branch 'pci/controller/s32g'
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=dfb77c81a68309182a458cb76c72fedfe8834482;p=linux%2F.git

Merge branch 'pci/controller/s32g'

- Add NXP S32G host controller DT binding and driver (Vincent Guittot)

* pci/controller/s32g:
  MAINTAINERS: Add NXP S32G PCIe controller driver maintainer
  PCI: s32g: Add NXP S32G PCIe controller driver (RC)
  PCI: dwc: Add register and bitfield definitions
  dt-bindings: PCI: s32g: Add NXP S32G PCIe controller
---

dfb77c81a68309182a458cb76c72fedfe8834482
diff --cc drivers/pci/controller/dwc/Makefile
index 7c8de0067612,3301bbbad78c..23e525e54702
--- a/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@@ -10,11 -10,9 +10,12 @@@ obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.
  obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
  obj-$(CONFIG_PCIE_FU740) += pcie-fu740.o
  obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
+ obj-$(CONFIG_PCIE_NXP_S32G) += pcie-nxp-s32g.o
  obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
 +# ARM32 platforms use hook_fault_code() and cannot support loadable module.
  obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone.o
 +# On non-ARM32 platforms, loadable module can be supported.
 +obj-$(CONFIG_PCI_KEYSTONE_TRISTATE) += pci-keystone.o
  obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
  obj-$(CONFIG_PCI_LAYERSCAPE_EP) += pci-layerscape-ep.o
  obj-$(CONFIG_PCIE_QCOM_COMMON) += pcie-qcom-common.o