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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/host/Kconfig
index 4f8e951d7252fa238e47bcae9b2851716348166f,7c47d69a2664d10021dde332c58bab533358ae96..391623e516f067cd753dad54e35705ad050afb57
--- 1/drivers/pci/host/Kconfig
--- 2/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
  

diff --cc drivers/pci/host/Makefile
Simple merge

diff --cc drivers/pci/host/pci-imx6.c
Simple merge

diff --cc drivers/pci/host/pci-keystone.c
Simple merge