Merge branch 'pci/host-hisi' into next

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

diff --combined MAINTAINERS
index eeb9ec999cdae4d8e5f85490eea55879750d8046,944a229bb01ede30b789a92de39dc94068d7c6f6..556a8c0b840679401c8f71188c405fbc816839f9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7938,14 -7938,6 +7938,14 @@@ F:    include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR ALTERA PCIE IP
 +M:    Ley Foon Tan <lftan@altera.com>
 +L:    rfi@lists.rocketboards.org (moderated for non-subscribers)
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/altera-pcie.txt
 +F:    drivers/pci/host/pcie-altera.c
 +
  PCI DRIVER FOR ARM VERSATILE PLATFORM
  M:    Rob Herring <robh@kernel.org>
  L:    linux-pci@vger.kernel.org
@@@ -8047,14 -8039,6 +8047,14 @@@ L:    linux-pci@vger.kernel.or
  S:    Maintained
  F:    drivers/pci/host/*spear*
  
 +PCI MSI DRIVER FOR ALTERA MSI IP
 +M:    Ley Foon Tan <lftan@altera.com>
 +L:    rfi@lists.rocketboards.org (moderated for non-subscribers)
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
 +F:    drivers/pci/host/pcie-altera-msi.c
 +
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
  M:    Duc Dang <dhdang@apm.com>
  L:    linux-pci@vger.kernel.org
@@@ -8063,6 -8047,13 +8063,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
  F:    drivers/pci/host/pci-xgene-msi.c
  
+ PCIE DRIVER FOR HISILICON
+ M:    Zhou Wang <wangzhou1@hisilicon.com>
+ L:    linux-pci@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
+ F:    drivers/pci/host/pcie-hisi.c
+ 
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org

diff --combined drivers/pci/host/Kconfig
index dabab0c7838022302e8dd31219f874ed2e8f28b2,ae873beaff2bea041baaab6f2ba6d91aa03cdd38..70370f28da8709024d9ca2c96109a6da77b137f4
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -39,8 -39,7 +39,8 @@@ config PCI_TEGR
  
  config PCI_RCAR_GEN2
        bool "Renesas R-Car Gen2 Internal PCI controller"
 -      depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
 +      depends on ARM
 +      depends on ARCH_SHMOBILE || COMPILE_TEST
        help
          Say Y here if you want internal PCI support on R-Car Gen2 SoC.
          There are 3 internal PCI controllers available with a single
@@@ -48,8 -47,7 +48,8 @@@
  
  config PCI_RCAR_GEN2_PCIE
        bool "Renesas R-Car PCIe controller"
 -      depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
 +      depends on ARM
 +      depends on ARCH_SHMOBILE || COMPILE_TEST
        help
          Say Y here if you want PCIe controller support on R-Car Gen2 SoCs.
  
@@@ -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 --combined 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