Merge branch 'pci/host-hisi' into next

* pci/host-hisi:
  PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/host/Kconfig
index dabab0c7838022302e8dd31219f874ed2e8f28b2,ae873beaff2bea041baaab6f2ba6d91aa03cdd38..70370f28da8709024d9ca2c96109a6da77b137f4
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -147,21 -145,12 +147,29 @@@ config PCIE_IPROC_BCM
          Say Y here if you want to use the Broadcom iProc PCIe controller
          through the BCMA bus interface
  
 +config PCIE_ALTERA
 +      bool "Altera PCIe controller"
 +      depends on ARM || NIOS2
 +      depends on OF_PCI
 +      select PCI_DOMAINS
 +      help
 +        Say Y here if you want to enable PCIe controller support on Altera
 +        FPGA.
 +
 +config PCIE_ALTERA_MSI
 +      bool "Altera PCIe MSI feature"
 +      depends on PCIE_ALTERA && PCI_MSI
 +      select PCI_MSI_IRQ_DOMAIN
 +      help
 +        Say Y here if you want PCIe MSI support for the Altera FPGA.
 +        This MSI driver supports Altera MSI to GIC controller IP.
 +
+ config PCI_HISI
+       depends on OF && ARM64
+       bool "HiSilicon SoC HIP05 PCIe controller"
+       select PCIEPORTBUS
+       select PCIE_DW
+       help
+         Say Y here if you want PCIe controller support on HiSilicon HIP05 SoC
+ 
  endmenu

diff --cc drivers/pci/host/Makefile
index 6c4913dfd235ad2fa1c653d7ee3c56caef9d4168,ea1dbf28ae4197ed59d9ffb65bbeeb91659b2093..9d4d3c6924a1da4956105c587b13e35f4ea71a43
--- 1/drivers/pci/host/Makefile
--- 2/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@@ -17,5 -17,4 +17,6 @@@ obj-$(CONFIG_PCI_VERSATILE) += pci-vers
  obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
  obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o
  obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-iproc-bcma.o
 +obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o
 +obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o
+ obj-$(CONFIG_PCI_HISI) += pcie-hisi.o