From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 2 Jan 2019 21:31:15 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/uniphier'
X-Git-Tag: v5.0-rc1~17^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=cdf4f4dc118bafd97d0148d53730e396ece11afa;p=linux-2.6-block.git

Merge branch 'remotes/lorenzo/pci/uniphier'

  - Add UniPhier PCIe controller driver and DT bindings (Kunihiko Hayashi)

* remotes/lorenzo/pci/uniphier:
  PCI: uniphier: Add UniPhier PCIe host controller support
  dt-bindings: PCI: Add UniPhier PCIe host controller description

# Conflicts:
#	drivers/pci/controller/dwc/Kconfig
#	drivers/pci/controller/dwc/Makefile
---

cdf4f4dc118bafd97d0148d53730e396ece11afa
diff --cc drivers/pci/controller/dwc/Kconfig
index 0b1ab6b5e234,955068867c35..548c58223868
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@@ -193,14 -193,14 +193,24 @@@ config PCIE_HISI_ST
  	help
            Say Y here if you want PCIe controller support on HiSilicon STB SoCs
  
 +config PCI_MESON
 +	bool "MESON PCIe controller"
 +	depends on PCI_MSI_IRQ_DOMAIN
 +	select PCIE_DW_HOST
 +	help
 +	  Say Y here if you want to enable PCI controller support on Amlogic
 +	  SoCs. The PCI controller on Amlogic is based on DesignWare hardware
 +	  and therefore the driver re-uses the DesignWare core functions to
 +	  implement the driver.
 +
+ config PCIE_UNIPHIER
+ 	bool "Socionext UniPhier PCIe controllers"
+ 	depends on ARCH_UNIPHIER || COMPILE_TEST
+ 	depends on OF && HAS_IOMEM
+ 	depends on PCI_MSI_IRQ_DOMAIN
+ 	select PCIE_DW_HOST
+ 	help
+ 	  Say Y here if you want PCIe controller support on UniPhier SoCs.
+ 	  This driver supports LD20 and PXs3 SoCs.
+ 
  endmenu
diff --cc drivers/pci/controller/dwc/Makefile
index e05a0153ffc4,688a0ec13121..7bcdcdf5024e
--- a/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@@ -14,7 -14,7 +14,8 @@@ obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-ar
  obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
  obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o
  obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o
 +obj-$(CONFIG_PCI_MESON) += pci-meson.o
+ obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o
  
  # The following drivers are for devices that use the generic ACPI
  # pci_root.c driver but don't support standard ECAM config access.