Skip to content

Commit 4dd4d99

Browse files
bjorn-helgaasbjorn-helgaas
committed
Merge branch 'remotes/lorenzo/pci/mediatek'
 - Fix Mediatek unchecked return value from devm_pci_remap_iospace() (Gustavo A. R. Silva) - Fix Mediatek endpoint/port matching logic (Honghui Zhang) - Change Mediatek Root Port Class Code to PCI_CLASS_BRIDGE_PCI (Honghui Zhang) - Remove redundant Mediatek PM domain check (Honghui Zhang) - Convert Mediatek to pci_host_probe() (Honghui Zhang) - Fix Mediatek MSI enablement (Honghui Zhang) - Add Mediatek system PM support for MT2712 and MT7622 (Honghui Zhang) - Add Mediatek loadable module support (Honghui Zhang) * remotes/lorenzo/pci/mediatek: PCI: mediatek: Add loadable kernel module support PCI: mediatek: Add system PM support for MT2712 and MT7622 PCI: mediatek: Fixup MSI enablement logic by enabling MSI before clocks PCI: mediatek: Convert to use pci_host_probe() PCI: mediatek: Remove the redundant dev->pm_domain check PCI: mediatek: Fix class type for MT7622 to PCI_CLASS_BRIDGE_PCI PCI: mediatek: Fix mtk_pcie_find_port() endpoint/port matching logic PCI: mediatek: Fix unchecked return value
2 parents fc23af0 + 031337a commit 4dd4d99

File tree

2 files changed

+206
-117
lines changed

2 files changed

+206
-117
lines changed

‎drivers/pci/controller/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ config PCIE_ROCKCHIP_EP
233233
available to support GEN2 with 4 slots.
234234

235235
config PCIE_MEDIATEK
236-
bool "MediaTek PCIe controller"
236+
tristate "MediaTek PCIe controller"
237237
depends on ARCH_MEDIATEK || COMPILE_TEST
238238
depends on OF
239239
depends on PCI_MSI_IRQ_DOMAIN

0 commit comments

Comments
 (0)