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

diff --cc drivers/pci/host/Kconfig
index 95ff14486ff497201ae2d461d7078d791bb6e755,e2f323a528435598fb8632860b8ea78ea40b4c05..746eaf8a6e8fac2ae44bc4e9a35f956d603f2540
--- 1/drivers/pci/host/Kconfig
--- 2/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

diff --cc drivers/pci/host/pcie-mediatek.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge