diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 11:41:57 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 11:41:57 -0500 |
| commit | 359a98325be5dc9ac5e999a88df8048a60e5f7a2 (patch) | |
| tree | c8d7e80c262020d7f736624c5cb213ff3cb957dd | |
| parent | b4773c53c54a3511aba30028d6df95c2e8433f09 (diff) | |
| parent | b3b76fc86f0fb4d98918f48c784138bfa950dff6 (diff) | |
| download | linux-359a98325be5dc9ac5e999a88df8048a60e5f7a2.tar.gz linux-359a98325be5dc9ac5e999a88df8048a60e5f7a2.tar.bz2 linux-359a98325be5dc9ac5e999a88df8048a60e5f7a2.zip | |
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
| -rw-r--r-- | Documentation/devicetree/bindings/pci/mediatek-pcie.txt | 1 | ||||
| -rw-r--r-- | drivers/pci/controller/Kconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie.txt b/Documentation/devicetree/bindings/pci/mediatek-pcie.txt index 57ae73462272..684227522267 100644 --- a/Documentation/devicetree/bindings/pci/mediatek-pcie.txt +++ b/Documentation/devicetree/bindings/pci/mediatek-pcie.txt @@ -7,6 +7,7 @@ Required properties: "mediatek,mt7622-pcie" "mediatek,mt7623-pcie" "mediatek,mt7629-pcie" + "airoha,en7523-pcie" - device_type: Must be "pci" - reg: Base addresses and lengths of the root ports. - reg-names: Names of the above areas to use during resource lookup. diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index 9dbd73898b47..d1c5fcf00a8a 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -237,7 +237,7 @@ config PCIE_ROCKCHIP_EP config PCIE_MEDIATEK tristate "MediaTek PCIe controller" - depends on ARCH_MEDIATEK || COMPILE_TEST + depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST depends on OF depends on PCI_MSI_IRQ_DOMAIN help |