Merge branch 'pci/host-tango' into next

* pci/host-tango:
  PCI: tango: Add Sigma Designs Tango SMP8759 PCIe host bridge support
  PCI: Add DT binding for Sigma Designs Tango PCIe controller

Conflicts:
	drivers/pci/host/Kconfig
	drivers/pci/host/Makefile

diff --cc drivers/pci/host/Kconfig
index 0cd5b30dccb15d1655424faeff8385cd528d48b4,8e54115681d840168fa355fb55974d85a079069c..89d61c2cbfaa1c2926e7592a4b1d62b4b45208e2
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -180,17 -180,20 +180,31 @@@ config PCIE_ROCKCHI
          There is 1 internal PCIe port available to support GEN2 with
          4 slots.
  
 +config PCIE_MEDIATEK
 +      bool "MediaTek PCIe controller"
 +      depends on ARM && (ARCH_MEDIATEK || COMPILE_TEST)
 +      depends on OF
 +      depends on PCI
 +      select PCIEPORTBUS
 +      help
 +        Say Y here if you want to enable PCIe controller support on
 +        MT7623 series SoCs.  There is one single root complex with 3 root
 +        ports available.  Each port supports Gen2 lane x1.
 +
+ config PCIE_TANGO_SMP8759
+       bool "Tango SMP8759 PCIe controller (DANGEROUS)"
+       depends on ARCH_TANGO && PCI_MSI && OF
+       depends on BROKEN
+       select PCI_HOST_COMMON
+       help
+         Say Y here to enable PCIe controller support for Sigma Designs
+         Tango SMP8759-based systems.
+ 
+         Note: The SMP8759 controller multiplexes PCI config and MMIO
+         accesses, and Linux doesn't provide a way to serialize them.
+         This can lead to data corruption if drivers perform concurrent
+         config and MMIO accesses.
+ 
  config VMD
        depends on PCI_MSI && X86_64 && SRCU
        tristate "Intel Volume Management Device Driver"

diff --cc drivers/pci/host/Makefile
index b10d104c85fdd43e4baa2e06ea418268d8c7c749,eb48aa6377c8ecbf71333585679dffa427d1d212..12382785e02a652637b64599e1b51c6a7b78206d
--- 1/drivers/pci/host/Makefile
--- 2/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@@ -18,7 -18,7 +18,8 @@@ obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-i
  obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o
  obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o
  obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
 +obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
+ obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
  obj-$(CONFIG_VMD) += vmd.o
  
  # The following drivers are for devices that use the generic ACPI