From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 3 Nov 2015 14:39:19 +0000 (-0600)
Subject: Merge branch 'pci/host-hisi' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ed31f24a6416cc60bc8e92c25b2de3060fbedf8;p=linux-beck.git

Merge branch 'pci/host-hisi' into next

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

4ed31f24a6416cc60bc8e92c25b2de3060fbedf8
diff --cc drivers/pci/host/Kconfig
index dabab0c78380,ae873beaff2b..70370f28da87
--- a/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 6c4913dfd235,ea1dbf28ae41..9d4d3c6924a1
--- a/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