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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/controller/dwc/Kconfig
Simple merge

diff --cc drivers/pci/controller/dwc/Makefile
index 7c8de00676127f76e8f8afb6829833383485a10e,3301bbbad78cc6233a9b2866f0d5e1fd2b694584..23e525e54702e01318d2163df917f0c88a105727
--- 1/drivers/pci/controller/dwc/Makefile
--- 2/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

diff --cc drivers/pci/controller/dwc/pcie-designware.h
Simple merge