Merge branch 'pci/host-xgene' into next

* pci/host-xgene:
  arm64: dts: Add APM X-Gene PCIe device tree nodes
  PCI: xgene: Add APM X-Gene PCIe driver

Conflicts:
	drivers/pci/host/Kconfig
	drivers/pci/host/Makefile

diff --cc MAINTAINERS
index 07fd7e279700f2bf05b070585a7575521954f3e0,076eb68874f489f47d6a8083f8f39772312aead9..fac7057ba67c35a0727b6c2d1d6b9462b87b0354
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6868,9 -6868,17 +6868,17 @@@ F:    include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
+ PCI DRIVER FOR APPLIEDMICRO XGENE
+ M:    Tanmay Inamdar <tinamdar@apm.com>
+ L:    linux-pci@vger.kernel.org
+ L:    linux-arm-kernel@lists.infradead.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
+ F:    drivers/pci/host/pci-xgene.c
+ 
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <r65037@freescale.com>
 -M:    Shawn Guo <shawn.guo@freescale.com>
 +M:    Lucas Stach <l.stach@pengutronix.de>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained

diff --cc drivers/pci/host/Kconfig
index 34134d64f35a6db46ab91d2362442b350412efd0,d55de1b6dddee5d5c8c9b6b3dbb5ce40596a6b3b..413c3611886a284c2208be5133ae2e883952ca7c
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -63,23 -63,14 +63,32 @@@ config PCIE_SPEAR13X
        help
          Say Y here if you want PCIe support on SPEAr13XX SoCs.
  
- 
 +config PCI_KEYSTONE
 +      bool "TI Keystone PCIe controller"
 +      depends on ARCH_KEYSTONE
 +      select PCIE_DW
 +      select PCIEPORTBUS
 +      help
 +        Say Y here if you want to enable PCI controller support on Keystone
 +        SoCs. The PCI controller on Keystone is based on Designware hardware
 +        and therefore the driver re-uses the Designware core functions to
 +        implement the driver.
 +
 +config PCIE_XILINX
 +      bool "Xilinx AXI PCIe host bridge support"
 +      depends on ARCH_ZYNQ
 +      help
 +        Say 'Y' here if you want kernel to support the Xilinx AXI PCIe
 +        Host Bridge driver.
 +
+ config PCI_XGENE
+       bool "X-Gene PCIe controller"
+       depends on ARCH_XGENE
+       depends on OF
+       select PCIEPORTBUS
+       help
+         Say Y here if you want internal PCI support on APM X-Gene SoC.
+         There are 5 internal PCIe ports available. Each port is GEN3 capable
+         and have varied lanes from x1 to x8.
+ 
  endmenu

diff --cc drivers/pci/host/Makefile
index 182929cdbcd91766e971a26f7665e43e58b98aec,845611ff3de941478b0e47ab1d8ac34e55773a9c..26b3461d68d7b1055abec2a83c30c2f20b96713c
--- 1/drivers/pci/host/Makefile
--- 2/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@@ -8,5 -8,4 +8,6 @@@ obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar
  obj-$(CONFIG_PCI_RCAR_GEN2_PCIE) += pcie-rcar.o
  obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o
  obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
 +obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone-dw.o pci-keystone.o
 +obj-$(CONFIG_PCIE_XILINX) += pcie-xilinx.o
+ obj-$(CONFIG_PCI_XGENE) += pci-xgene.o