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 <robimarko@gmail.com>

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 99bd9a71a24cd08e31b3dba9ae97b551515ad06a..a11d033a965857a1f320ae702be756b8c9306f12 100644 (file)
--- 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 4792ed5d43a6e47512d4fa5bd07753cc683a3bf6..04bb6fc79a609d97357a1a3437a790ad6767a064 100644 (file)
--- 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 d25ff0f1cbf15931644577bdaf8f775ca442d777..a9c04176ec576d364295025bf8bad14a7f355efc 100644 (file)
--- 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 9aa201ab6b95b82f3c86d4b47ca3d0432955f4c2..5399ee387c89f46eae3406dc9f99ebf6ae26ee78 100644 (file)
--- 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 9cfd3a52395eba0cdf3cc8bcea6fa597e1e76ea1..46382582e3e558f9efede4e45bae0ba3a4ae7f0f 100644 (file)
--- 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 c6889df25d8de974e02e88eb682750fce8bfeaca..8236d98d3c1cbadb87484a61ac4a70a6d171fd19 100644 (file)
--- 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 ec66d47d16a93f4b35506e0876a41fc3a51acf73..00a96fbdbaf8e6de6a343dcb90c7cee9a6295b85 100644 (file)
--- 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 289680d678be0735126da28c54566858c6a4b382..231a38f2c4a5913b94d42e85f19fbdc6ffe68f6d 100644 (file)
--- 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 9d28f2ad0d4aeca28a6da7c7a67a7cd3361b5561..8aae54150759ee310d58523d45231cd0cdbd4aca 100644 (file)
--- 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 70f4438ab0c5308ed6cfd777c49086e430842e2c..4d5471153e602dd6ba706bbbab70d40131c44801 100644 (file)
--- 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 5b2c1d570fd9434b86e665f853e3c3d4a0309e36..51c4ac99dd89c3750cbb8ced046d3153e43d7d25 100644 (file)
--- 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 {