From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 15 Mar 2016 13:55:52 +0000 (-0500)
Subject: Merge branch 'pci/host-designware' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=562df5c8521e1371f3cbd0b7b868034da376d714;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'pci/host-designware' into next

* pci/host-designware:
  PCI: designware: Add driver for prototyping kits based on ARC SDP
  PCI: designware: Add default link up check if sub-driver doesn't override
  PCI: designware: Add generic dw_pcie_wait_for_link()
  ARC: Add PCI support
---

562df5c8521e1371f3cbd0b7b868034da376d714
diff --cc drivers/pci/host/Kconfig
index 4f8e951d7252,7c47d69a2664..391623e516f0
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -16,16 -16,17 +16,28 @@@ config PCI_MVEB
  	depends on ARCH_MVEBU || ARCH_DOVE
  	depends on OF
  
++
 +config PCIE_XILINX_NWL
 +	bool "NWL PCIe Core"
 +	depends on ARCH_ZYNQMP
 +	select PCI_MSI_IRQ_DOMAIN if PCI_MSI
 +	help
 +	 Say 'Y' here if you want kernel support for Xilinx
 +	 NWL PCIe controller. The controller can act as Root Port
 +	 or End Point. The current option selection will only
 +	 support root port enabling.
 +
+ config PCIE_DW_PLAT
+ 	bool "Platform bus based DesignWare PCIe Controller"
+ 	select PCIE_DW
+ 	---help---
+ 	 This selects the DesignWare PCIe controller support. Select this if
+ 	 you have a PCIe controller on Platform bus.
+ 
+ 	 If you have a controller with this interface, say Y or M here.
+ 
+ 	 If unsure, say N.
+ 
  config PCIE_DW
  	bool