Merge branch 'pci/host-rockchip' into next

* pci/host-rockchip:
  PCI: rockchip: Modularize
  PCI: Export pci_remap_iospace() and pci_unmap_iospace()
  PCI: rockchip: Add remove() support
  PCI: rockchip: Set PCI_EXP_LNKSTA_SLC in the Root Port
  PCI: rockchip: Advertise 128-byte Read Completion Boundary support
  PCI: rockchip: Make 'return 0' more obvious in probe()
  PCI: rockchip: Unindent rockchip_pcie_set_power_limit()
  PCI: rockchip: Handle regulator_get_current_limit() failure correctly

diff --combined drivers/pci/host/Kconfig
index 2ce1b19a9ef75daba138126637e0e6c0eb3ee832,d2293ed81cf947487370a1eab7d1e95a82108f9d..7f47cd5e10a57c4f7de8f175b3034fe375d6785f
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -27,12 -27,6 +27,12 @@@ config PCIE_XILINX_NW
         or End Point. The current option selection will only
         support root port enabling.
  
 +config PCI_FTPCI100
 +      bool "Faraday Technology FTPCI100 PCI controller"
 +      depends on OF
 +      depends on ARM
 +      default ARCH_GEMINI
 +
  config PCI_TEGRA
        bool "NVIDIA Tegra PCIe controller"
        depends on ARCH_TEGRA
@@@ -101,7 -95,6 +101,7 @@@ config PCI_VERSATIL
  
  config PCIE_IPROC
        tristate
 +      select PCI_DOMAINS
        help
          This enables the iProc PCIe core controller support for Broadcom's
          iProc family of SoCs. An appropriate bus interface driver needs
@@@ -122,6 -115,7 +122,6 @@@ config PCIE_IPROC_BCM
        depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST)
        select PCIE_IPROC
        select BCMA
 -      select PCI_DOMAINS
        default ARCH_BCM_5301X
        help
          Say Y here if you want to use the Broadcom iProc PCIe controller
@@@ -170,7 -164,7 +170,7 @@@ config PCI_HOST_THUNDER_ECA
          Say Y here if you want ECAM support for CN88XX-Pass-1.x Cavium Thunder SoCs.
  
  config PCIE_ROCKCHIP
-       bool "Rockchip PCIe controller"
+       tristate "Rockchip PCIe controller"
        depends on ARCH_ROCKCHIP || COMPILE_TEST
        depends on OF
        depends on PCI_MSI_IRQ_DOMAIN