Skip to content

Commit 359a983

Browse files
committed
Merge branch 'pci/ctrl/mediatek'
- Add Airoha EN7532 to DT binding (John Crispin) - Allow building of mediatek driver for ARCH_AIROHA (Felix Fietkau) * pci/ctrl/mediatek: PCI: mediatek: Allow building for ARCH_AIROHA dt-bindings: PCI: mediatek: Add Airoha EN7532 support
2 parents b4773c5 + b3b76fc commit 359a983

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Documentation/devicetree/bindings/pci/mediatek-pcie.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Required properties:
77
"mediatek,mt7622-pcie"
88
"mediatek,mt7623-pcie"
99
"mediatek,mt7629-pcie"
10+
"airoha,en7523-pcie"
1011
- device_type: Must be "pci"
1112
- reg: Base addresses and lengths of the root ports.
1213
- reg-names: Names of the above areas to use during resource lookup.

drivers/pci/controller/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ config PCIE_ROCKCHIP_EP
237237

238238
config PCIE_MEDIATEK
239239
tristate "MediaTek PCIe controller"
240-
depends on ARCH_MEDIATEK || COMPILE_TEST
240+
depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST
241241
depends on OF
242242
depends on PCI_MSI_IRQ_DOMAIN
243243
help

0 commit comments

Comments
 (0)