From 0f1b249eac45506e1b1a090d3286d5cf01563fcc Mon Sep 17 00:00:00 2001 From: Rany Hany Date: Mon, 6 May 2024 01:39:58 +0300 Subject: [PATCH] mediatek: fix broken PCIe caused by update to 5.15.158 The patch "710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch" makes use of "syscon_regmap_lookup_by_phandle" which requires that "syscon" be in the compatible list. Without this patch, PCIe probe will fail with the following error: [ 1.287467] mtk-pcie 1a143000.pcie: host bridge /pcie@1a143000 ranges: [ 1.294019] mtk-pcie 1a143000.pcie: Parsing ranges property... [ 1.299901] mtk-pcie 1a143000.pcie: MEM 0x0020000000..0x0027ffffff -> 0x0020000000 [ 1.307954] mtk-pcie 1a143000.pcie: missing hifsys node [ 1.313185] mtk-pcie: probe of 1a143000.pcie failed with error -22 Fixes: 01c58a0d2a ("kernel: bump 5.15 to 5.15.158") Signed-off-by: Rany Hany (cherry picked from commit 8607372b410fbb24b08de97ff5941341d0870d6f) --- ...-pci-pcie-mediatek-add-support-for-coherent-DMA.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/linux/mediatek/patches-5.15/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch b/target/linux/mediatek/patches-5.15/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch index a3247f1779..917a458d30 100644 --- a/target/linux/mediatek/patches-5.15/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch +++ b/target/linux/mediatek/patches-5.15/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch @@ -30,6 +30,15 @@ Signed-off-by: Felix Fietkau #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; +@@ -937,7 +943,7 @@ + }; + + hifsys: clock-controller@1af00000 { +- compatible = "mediatek,mt7622-hifsys"; ++ compatible = "mediatek,mt7622-hifsys", "syscon"; + reg = <0 0x1af00000 0 0x70>; + #clock-cells = <1>; + }; --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -20,6 +20,7 @@ -- 2.30.2