Merge branch 'pci/visconti'

- Add Toshiba Visconti PCIe host controller driver (Nobuhiro Iwamatsu)

* pci/visconti:
  MAINTAINERS: Add entries for Toshiba Visconti PCIe controller
  PCI: visconti: Add Toshiba Visconti PCIe host controller driver

diff --combined drivers/pci/controller/dwc/Kconfig
index 60d3dde,7c3dcb8..5ae63cd
--- 1/drivers/pci/controller/dwc/Kconfig
--- 2/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@@ -214,17 -214,6 +214,17 @@@ config PCIE_ARTPEC6_E
          Enables support for the PCIe controller in the ARTPEC-6 SoC to work in
          endpoint mode. This uses the DesignWare core.
  
 +config PCIE_ROCKCHIP_DW_HOST
 +      bool "Rockchip DesignWare PCIe controller"
 +      select PCIE_DW
 +      select PCIE_DW_HOST
 +      depends on PCI_MSI_IRQ_DOMAIN
 +      depends on ARCH_ROCKCHIP || COMPILE_TEST
 +      depends on OF
 +      help
 +        Enables support for the DesignWare PCIe controller in the
 +        Rockchip SoC except RK3399.
 +
  config PCIE_INTEL_GW
        bool "Intel Gateway PCIe host controller support"
        depends on OF && (X86 || COMPILE_TEST)
@@@ -297,6 -286,15 +297,15 @@@ config PCIE_TEGRA194_E
          in order to enable device-specific features PCIE_TEGRA194_EP must be
          selected. This uses the DesignWare core.
  
+ config PCIE_VISCONTI_HOST
+       bool "Toshiba Visconti PCIe controllers"
+       depends on ARCH_VISCONTI || COMPILE_TEST
+       depends on PCI_MSI_IRQ_DOMAIN
+       select PCIE_DW_HOST
+       help
+         Say Y here if you want PCIe controller support on Toshiba Visconti SoC.
+         This driver supports TMPV7708 SoC.
+ 
  config PCIE_UNIPHIER
        bool "Socionext UniPhier PCIe host controllers"
        depends on ARCH_UNIPHIER || COMPILE_TEST

diff --combined drivers/pci/controller/dwc/Makefile
index 3710e91,eca97c4..e2ddcaf
--- 1/drivers/pci/controller/dwc/Makefile
--- 2/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@@ -14,7 -14,6 +14,7 @@@ obj-$(CONFIG_PCI_LAYERSCAPE_EP) += pci-
  obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
  obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
  obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
 +obj-$(CONFIG_PCIE_ROCKCHIP_DW_HOST) += pcie-dw-rockchip.o
  obj-$(CONFIG_PCIE_INTEL_GW) += pcie-intel-gw.o
  obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o
  obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o
@@@ -22,6 -21,7 +22,7 @@@ obj-$(CONFIG_PCI_MESON) += pci-meson.
  obj-$(CONFIG_PCIE_TEGRA194) += pcie-tegra194.o
  obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o
  obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.o
+ obj-$(CONFIG_PCIE_VISCONTI_HOST) += pcie-visconti.o
  
  # The following drivers are for devices that use the generic ACPI
  # pci_root.c driver but don't support standard ECAM config access.