From: Bjorn Helgaas Date: Wed, 6 Jun 2018 21:10:37 +0000 (-0500) Subject: Merge branch 'lorenzo/pci/mediatek' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cc64520f970a0b9a2d94c815d9bf5fd5c88f213d;p=linux.git Merge branch 'lorenzo/pci/mediatek' - implement Mediatek chained IRQ handling (Honghui Zhang) - fix vendor ID & class type for Mediatek MT7622 (Honghui Zhang) * lorenzo/pci/mediatek: PCI: mediatek: Implement chained IRQ handling setup PCI: mediatek: Set up vendor ID and class type for MT7622 # Conflicts: # drivers/pci/host/Kconfig --- cc64520f970a0b9a2d94c815d9bf5fd5c88f213d diff --cc drivers/pci/host/Kconfig index 95ff14486ff49,e2f323a528435..746eaf8a6e8fa --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@@ -191,8 -191,10 +191,9 @@@ config PCIE_ROCKCHI 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