From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 3 Nov 2015 14:39:32 +0000 (-0600)
Subject: Merge branch 'pci/host-layerscape' into next
X-Git-Tag: v4.4-rc1~91^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=7225107e158241b7e22f15b9f4c3db0b3330984d;hp=-c

Merge branch 'pci/host-layerscape' into next

* pci/host-layerscape:
  PCI: layerscape: Add ls_pcie_msi_host_init()
  PCI: layerscape: Add support for LS1043a and LS2080a
  PCI: layerscape: Remove unused fields from struct ls_pcie
  PCI: layerscape: Update ls_add_pcie_port()
  PCI: layerscape: Factor out SCFG related function
  PCI: layerscape: Ignore PCIe controllers in Endpoint mode
  PCI: layerscape: Remove ls_pcie_establish_link()
---

7225107e158241b7e22f15b9f4c3db0b3330984d
diff --combined drivers/pci/host/Kconfig
index 70370f28da87,fcf08a03535d..f131ba947dc6
--- a/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.
  
@@@ -107,7 -105,7 +107,7 @@@ config PCI_XGENE_MS
  
  config PCI_LAYERSCAPE
  	bool "Freescale Layerscape PCIe controller"
- 	depends on OF && ARM
+ 	depends on OF && (ARM || ARCH_LAYERSCAPE)
  	select PCIE_DW
  	select MFD_SYSCON
  	help
@@@ -147,29 -145,4 +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