Merge branch 'pci/controller/dwc-andes-qilai'

- Add Andes QiLai SoC PCIe host driver support (Randolph Lin)

* pci/controller/dwc-andes-qilai:
  PCI: qilai: Add Andes QiLai SoC PCIe host driver support
  dt-bindings: PCI: Add Andes QiLai PCIe support

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

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

diff --cc drivers/pci/controller/dwc/Makefile
index 4867f30ab7c3b8a8cb607a4f0dd72d57a74408a7,9e61458dff00ddbafa51149886e775555bb21178..6a085befea9b377b553f58a11a689e2c268baaf4
--- 1/drivers/pci/controller/dwc/Makefile
--- 2/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@@ -5,6 -5,8 +5,7 @@@ 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_PCI_DRA7XX) += pci-dra7xx.o
  obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
  obj-$(CONFIG_PCIE_FU740) += pcie-fu740.o