Commit cc64520f authored by Bjorn Helgaas's avatar Bjorn Helgaas

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
parents 741f8e7e 42fe2f91
...@@ -193,6 +193,7 @@ config PCIE_MEDIATEK ...@@ -193,6 +193,7 @@ config PCIE_MEDIATEK
bool "MediaTek PCIe controller" bool "MediaTek PCIe controller"
depends on ARCH_MEDIATEK || COMPILE_TEST depends on ARCH_MEDIATEK || COMPILE_TEST
depends on OF depends on OF
depends on PCI_MSI_IRQ_DOMAIN
select PCIEPORTBUS select PCIEPORTBUS
help help
Say Y here if you want to enable PCIe controller support on Say Y here if you want to enable PCIe controller support on
......
This diff is collapsed.
...@@ -2120,6 +2120,8 @@ ...@@ -2120,6 +2120,8 @@
#define PCI_VENDOR_ID_MYRICOM 0x14c1 #define PCI_VENDOR_ID_MYRICOM 0x14c1
#define PCI_VENDOR_ID_MEDIATEK 0x14c3
#define PCI_VENDOR_ID_TITAN 0x14D2 #define PCI_VENDOR_ID_TITAN 0x14D2
#define PCI_DEVICE_ID_TITAN_010L 0x8001 #define PCI_DEVICE_ID_TITAN_010L 0x8001
#define PCI_DEVICE_ID_TITAN_100L 0x8010 #define PCI_DEVICE_ID_TITAN_100L 0x8010
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment