From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 4 May 2021 15:43:32 +0000 (-0500)
Subject: Merge branch 'pci/tegra'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=882862aaacefcb9f723b0f7817ddafc154465d8f;p=linux.git

Merge branch 'pci/tegra'

- Add MCFG quirks for Tegra194 ECAM errata (Vidya Sagar)

* pci/tegra:
  PCI: tegra: Add Tegra194 MCFG quirks for ECAM errata
---

882862aaacefcb9f723b0f7817ddafc154465d8f
diff --cc drivers/pci/controller/dwc/Makefile
index 952d01941f230,dbb9818765566..eca805c1a0235
--- a/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@@ -32,12 -30,8 +31,13 @@@ obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-
  # ARM64 and use internal ifdefs to only build the pieces we need
  # depending on whether ACPI, the DT driver, or both are enabled.
  
 -ifdef CONFIG_PCI
 +obj-$(CONFIG_PCIE_AL) += pcie-al.o
 +obj-$(CONFIG_PCI_HISI) += pcie-hisi.o
 +
 +ifdef CONFIG_ACPI
 +ifdef CONFIG_PCI_QUIRKS
  obj-$(CONFIG_ARM64) += pcie-al.o
  obj-$(CONFIG_ARM64) += pcie-hisi.o
+ obj-$(CONFIG_ARM64) += pcie-tegra194.o
  endif
 +endif