From: Bjorn Helgaas Date: Fri, 7 Jul 2017 18:42:25 +0000 (-0500) Subject: Merge branch 'pci/host-tango' into next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6aed468480e8b03ece5a395fe8013e66348a2547;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- 6aed468480e8b03ece5a395fe8013e66348a2547 diff --cc drivers/pci/host/Kconfig index 0cd5b30dccb1,8e54115681d8..89d61c2cbfaa --- a/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 b10d104c85fd,eb48aa6377c8..12382785e02a --- a/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