From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 2 Sep 2021 19:56:48 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/keembay'
X-Git-Tag: v5.15-rc1~61^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af42a0d4a88b658e848d4c27732203a364788b2d;p=thirdparty%2Flinux.git

Merge branch 'remotes/lorenzo/pci/keembay'

- Add Intel Keem Bay PCIe controller driver and DT binding (Srikanth
  Thokala)

* remotes/lorenzo/pci/keembay:
  PCI: keembay: Add support for Intel Keem Bay
  dt-bindings: PCI: Add Intel Keem Bay PCIe controller
---

af42a0d4a88b658e848d4c27732203a364788b2d
diff --cc drivers/pci/controller/dwc/Makefile
index e2ddcaf2e9f64,8b3e7176b4bf1..73244409792cb
--- a/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@@ -14,8 -14,8 +14,9 @@@ obj-$(CONFIG_PCI_LAYERSCAPE_EP) += pci-
  obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
  obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
  obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
 +obj-$(CONFIG_PCIE_ROCKCHIP_DW_HOST) += pcie-dw-rockchip.o
  obj-$(CONFIG_PCIE_INTEL_GW) += pcie-intel-gw.o
+ obj-$(CONFIG_PCIE_KEEMBAY) += pcie-keembay.o
  obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o
  obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o
  obj-$(CONFIG_PCI_MESON) += pci-meson.o