Merge branch 'pci/kconfig'

  - remove unnecessary host controller CONFIG_PCIEPORTBUS Kconfig
    selections (Bjorn Helgaas)

* pci/kconfig:
  PCI: Remove host driver Kconfig selection of CONFIG_PCIEPORTBUS

# Conflicts:
#	drivers/pci/dwc/Kconfig
#	drivers/pci/host/Kconfig

diff --cc drivers/pci/dwc/Kconfig
index 7445de1,678390a..16f52c6
--- 1/drivers/pci/dwc/Kconfig
--- 2/drivers/pci/dwc/Kconfig
+++ b/drivers/pci/dwc/Kconfig
@@@ -85,32 -65,32 +85,28 @@@ config PCIE_DW_PLAT_E
  
  config PCI_EXYNOS
        bool "Samsung Exynos PCIe controller"
 -      depends on PCI
 -      depends on SOC_EXYNOS5440
 +      depends on SOC_EXYNOS5440 || COMPILE_TEST
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
  
  config PCI_IMX6
        bool "Freescale i.MX6 PCIe controller"
 -      depends on PCI
 -      depends on SOC_IMX6Q
 +      depends on SOC_IMX6Q || (ARM && COMPILE_TEST)
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
  
  config PCIE_SPEAR13XX
        bool "STMicroelectronics SPEAr PCIe controller"
 -      depends on PCI
 -      depends on ARCH_SPEAR13XX
 +      depends on ARCH_SPEAR13XX || COMPILE_TEST
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
        help
          Say Y here if you want PCIe support on SPEAr13XX SoCs.
  
  config PCI_KEYSTONE
        bool "TI Keystone PCIe controller"
 -      depends on PCI
 -      depends on ARCH_KEYSTONE
 +      depends on ARCH_KEYSTONE || (ARM && COMPILE_TEST)
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
        help
          Say Y here if you want to enable PCI controller support on Keystone
@@@ -128,10 -109,10 +124,9 @@@ config PCI_LAYERSCAP
          Say Y here if you want PCIe controller support on Layerscape SoCs.
  
  config PCI_HISI
 -      depends on OF && ARM64
 +      depends on OF && (ARM64 || COMPILE_TEST)
        bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
 -      depends on PCI
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
        select PCI_HOST_COMMON
        help
@@@ -140,9 -121,9 +135,8 @@@
  
  config PCIE_QCOM
        bool "Qualcomm PCIe controller"
 -      depends on PCI
 -      depends on ARCH_QCOM && OF
 +      depends on OF && (ARCH_QCOM || COMPILE_TEST)
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
        help
          Say Y here to enable PCIe controller support on Qualcomm SoCs. The
@@@ -151,9 -132,9 +145,8 @@@
  
  config PCIE_ARMADA_8K
        bool "Marvell Armada-8K PCIe controller"
 -      depends on PCI
 -      depends on ARCH_MVEBU
 +      depends on ARCH_MVEBU || COMPILE_TEST
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
        help
          Say Y here if you want to enable PCIe controller support on
@@@ -166,9 -147,8 +159,8 @@@ config PCIE_ARTPEC
  
  config PCIE_ARTPEC6_HOST
        bool "Axis ARTPEC-6 PCIe controller Host Mode"
 -      depends on MACH_ARTPEC6
 -      depends on PCI && PCI_MSI_IRQ_DOMAIN
 +      depends on MACH_ARTPEC6 || COMPILE_TEST
 +      depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
        select PCIE_ARTPEC6
        help
@@@ -186,10 -166,10 +178,9 @@@ config PCIE_ARTPEC6_E
          endpoint mode. This uses the DesignWare core.
  
  config PCIE_KIRIN
 -      depends on OF && ARM64
 +      depends on OF && (ARM64 || COMPILE_TEST)
        bool "HiSilicon Kirin series SoCs PCIe controllers"
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
 -      depends on PCI
        select PCIE_DW_HOST
        help
          Say Y here if you want PCIe controller support
@@@ -197,9 -177,9 +188,8 @@@
  
  config PCIE_HISI_STB
        bool "HiSilicon STB SoCs PCIe controllers"
 -      depends on ARCH_HISI
 -      depends on PCI
 +      depends on ARCH_HISI || COMPILE_TEST
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        select PCIE_DW_HOST
        help
            Say Y here if you want PCIe controller support on HiSilicon STB SoCs

diff --cc drivers/pci/host/Kconfig
index 2593c83,90f0cc9..a96e23b
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -82,9 -81,8 +82,8 @@@ config PCIE_XILIN
  
  config PCI_XGENE
        bool "X-Gene PCIe controller"
 -      depends on ARM64
 +      depends on ARM64 || COMPILE_TEST
        depends on OF || (ACPI && PCI_QUIRKS)
-       select PCIEPORTBUS
        help
          Say Y here if you want internal PCI support on APM X-Gene SoC.
          There are 5 internal PCIe ports available. Each port is GEN3 capable
@@@ -194,24 -188,11 +193,23 @@@ config PCIE_ROCKCHIP_HOS
          There is 1 internal PCIe port available to support GEN2 with
          4 slots.
  
 +config PCIE_ROCKCHIP_EP
 +      bool "Rockchip PCIe endpoint controller"
 +      depends on ARCH_ROCKCHIP || COMPILE_TEST
 +      depends on OF
 +      depends on PCI_ENDPOINT
 +      select MFD_SYSCON
 +      select PCIE_ROCKCHIP
 +      help
 +        Say Y here if you want to support Rockchip PCIe controller in
 +        endpoint mode on Rockchip SoC. There is 1 internal PCIe port
 +        available to support GEN2 with 4 slots.
 +
  config PCIE_MEDIATEK
        bool "MediaTek PCIe controller"
 -      depends on (ARM || ARM64) && (ARCH_MEDIATEK || COMPILE_TEST)
 +      depends on ARCH_MEDIATEK || COMPILE_TEST
        depends on OF
 -      depends on PCI
 +      depends on PCI_MSI_IRQ_DOMAIN
-       select PCIEPORTBUS
        help
          Say Y here if you want to enable PCIe controller support on
          MediaTek SoCs.