From: Robert Marko Date: Mon, 12 May 2025 18:11:22 +0000 (+0200) Subject: qualcommax: remove PCIe bridge nodes X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=487fc2ec968bfbbdfe2ea0f3943885845d8fd5b9;p=openwrt%2Fopenwrt.git qualcommax: remove PCIe bridge nodes PCIe bridge nodes are now present in the SoC DTSI, so drop our downstream ones as otherwise ath1*k BDF matching will fail. Link: https://github.com/openwrt/openwrt/pull/18789 Signed-off-by: Robert Marko --- diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts index 99bd9a71a2..a11d033a96 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts @@ -307,12 +307,7 @@ perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts index 4792ed5d43..04bb6fc79a 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts @@ -154,12 +154,7 @@ perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts index d25ff0f1cb..a9c04176ec 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts @@ -165,12 +165,7 @@ perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts index 9aa201ab6b..5399ee387c 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts @@ -155,12 +155,7 @@ status = "okay"; perst-gpio = <&tlmm 60 GPIO_ACTIVE_LOW>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts index 9cfd3a5239..46382582e3 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts @@ -521,12 +521,8 @@ &pcie0 { status = "okay"; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + + pcie@0 { wifi@1,0 { status = "okay"; /* ath11k has no DT compatible for PCI cards */ diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts index c6889df25d..8236d98d3c 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts @@ -50,12 +50,7 @@ perst-gpio = <&tlmm 52 GPIO_ACTIVE_HIGH>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi0: wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts index ec66d47d16..00a96fbdba 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts @@ -535,12 +535,7 @@ perst-gpio = <&tlmm 58 GPIO_ACTIVE_LOW>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi@1,0 { status = "okay"; @@ -562,12 +557,7 @@ perst-gpio = <&tlmm 62 GPIO_ACTIVE_HIGH>; - bridge@1,0 { - reg = <0x00010000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts index 289680d678..231a38f2c4 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts @@ -281,13 +281,6 @@ status = "okay"; perst-gpio = <&tlmm 58 GPIO_ACTIVE_LOW>; - - bridge@0,0 { - reg = <0x00020000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - }; }; &pcie_qmp1 { @@ -299,12 +292,7 @@ perst-gpio = <&tlmm 61 GPIO_ACTIVE_LOW>; - bridge@1,0 { - reg = <0x00010000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts index 9d28f2ad0d..8aae541507 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts @@ -522,12 +522,7 @@ perst-gpio = <&tlmm 58 GPIO_ACTIVE_LOW>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi0: wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts index 70f4438ab0..4d5471153e 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts @@ -498,12 +498,7 @@ perst-gpio = <&tlmm 61 GPIO_ACTIVE_LOW>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - + pcie@0 { wifi@1,0 { status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts index 5b2c1d570f..51c4ac99dd 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts @@ -451,13 +451,6 @@ status = "okay"; perst-gpio = <&tlmm 58 GPIO_ACTIVE_LOW>; - - bridge@0,0 { - reg = <0x00020000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - }; }; &pcie_qmp1 { @@ -468,13 +461,6 @@ status = "okay"; perst-gpio = <&tlmm 62 GPIO_ACTIVE_HIGH>; - - bridge@1,0 { - reg = <0x00010000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - }; }; &wifi {