ipq806x: dts: reuse default PCIe bridge nodes

The default PCIe bridge nodes have been added upstream[1]. Remove
duplicate PCIe bridge definitions to simplify the device dts.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=0c4d19b125401957123989a25094972cf0e77670

Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18989
Signed-off-by: Christian Marangi <[email protected]>

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
index fbf5cd67126712ac684852bb264e7bb8ed307a02..b208c7ca53c3a9e809f845eeb3b866df9509d7b8 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
@@ -398,45 +398,31 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       qcom,ath10k-calibration-variant = "NEC-Platforms-WG2600HP3";
-
-                       nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
+               qcom,ath10k-calibration-variant = "NEC-Platforms-WG2600HP3";
        };
 };
 
 &pcie1 {
        status = "okay";
        force_gen1 = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       ieee80211-freq-limit = <2400000 2483000>;
-                       qcom,ath10k-calibration-variant = "NEC-Platforms-WG2600HP3";
-
-                       nvmem-cells = <&macaddr_PRODUCTDATA_c>, <&precal_ART_5000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               ieee80211-freq-limit = <2400000 2483000>;
+               nvmem-cells = <&macaddr_PRODUCTDATA_c>, <&precal_ART_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
+               qcom,ath10k-calibration-variant = "NEC-Platforms-WG2600HP3";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
index 4a28bfc5786353ead96d48b064183a822cc1427e..d28a07f00315dbfebdfaccfcd426fe2425c804d6 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
@@ -313,40 +313,28 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_defaultmac_8 (-1)>, <&precal_radio_1000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_defaultmac_8 (-1)>, <&precal_radio_1000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 
 &pcie1 {
        status = "okay";
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_defaultmac_8 0>, <&precal_radio_5000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_defaultmac_8 0>, <&precal_radio_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
index 24a7d2ca156a8be1d9465b38e926317c74a65b2f..d4d78674a63cf266ada36a6a3176d7d2bff64c08 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
@@ -204,20 +204,14 @@
        reset-gpios = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>;
        pinctrl-0 = <&pcie0_pins>;
        pinctrl-names = "default";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 
@@ -227,20 +221,14 @@
        pinctrl-0 = <&pcie1_pins>;
        pinctrl-names = "default";
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
index b4f14d8a0baf16ab35dcb3493e949a2c5bbbd118..cdd103706769a696cc7c76e2995c4f64c09bd06f 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
@@ -52,37 +52,27 @@
        status = "okay";
 
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-                       nvmem-cells = <&precal_art_1000>;
-                       nvmem-cell-names = "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x10000 0 0 0 0>;
+               nvmem-cells = <&precal_art_1000>;
+               nvmem-cell-names = "pre-calibration";
        };
 };
 
 &pcie1 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-                       nvmem-cells = <&precal_art_5000>;
-                       nvmem-cell-names = "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x10000 0 0 0 0>;
+               nvmem-cells = <&precal_art_5000>;
+               nvmem-cell-names = "pre-calibration";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
index 202731e9f02848e2ec1108b12bbaa43d8402f815..8e74567f54c706f94fe538af755b97a4edaedd28 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
@@ -341,20 +341,14 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_appsbl_7ff80 8>;
-                       nvmem-cell-names = "mac-address";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_appsbl_7ff80 8>;
+               nvmem-cell-names = "mac-address";
        };
 };
 
@@ -362,20 +356,14 @@
        status = "okay";
 
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_appsbl_7ff80 16>;
-                       nvmem-cell-names = "mac-address";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_appsbl_7ff80 16>;
+               nvmem-cell-names = "mac-address";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
index 24273291cb1e4981c71d845340c1ee0da8045124..1cecb301b4793fe4fdc0547b1f3da05e7ce1c684 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
@@ -285,35 +285,25 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi5g: wifi@1,0 {
-                       reg = <0x00010000 0 0 0 0>;
-                       compatible = "qcom,ath10k";
-                       qcom,ath10k-calibration-variant = "ASRock-G10";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               qcom,ath10k-calibration-variant = "ASRock-G10";
        };
 };
 
 &pcie1 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2g: wifi@1,0 {
-                       reg = <0x00010000 0 0 0 0>;
-                       compatible = "qcom,ath10k";
-                       qcom,ath10k-calibration-variant = "ASRock-G10";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               qcom,ath10k-calibration-variant = "ASRock-G10";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
index 469cdaa0a2f88c5030d5241c6121a8f02a4b3dab..6b79488d7f637d6a2086d78d13678fa78f9b8d6d 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
@@ -207,20 +207,14 @@
        reset-gpios = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
        pinctrl-0 = <&pcie0_pins>;
        pinctrl-names = "default";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 
@@ -230,20 +224,14 @@
        pinctrl-0 = <&pcie1_pins>;
        pinctrl-names = "default";
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
index f750d32e7502e0a1fcfbef07a36538d9e4ed9d3b..219af69ac91511fab5799b0d5b2b2d42899b4d16 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
@@ -287,39 +287,27 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_eeprom_6 1>;
-                       nvmem-cell-names = "mac-address";
-               };
+&pcie_bridge0 {
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x10000 0 0 0 0>;
+               nvmem-cells = <&macaddr_eeprom_6 1>;
+               nvmem-cell-names = "mac-address";
        };
 };
 
 &pcie1 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_eeprom_6 2>;
-                       nvmem-cell-names = "mac-address";
-               };
+&pcie_bridge1 {
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x10000 0 0 0 0>;
+               nvmem-cells = <&macaddr_eeprom_6 2>;
+               nvmem-cell-names = "mac-address";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
index 5a4ce00f5f350b06bb845d0496df064b1b42571d..32c0ee0d7bd53e75659db69f36b7825d9959aa65 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
@@ -341,40 +341,28 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_defaultmac_0 (-1)>, <&precal_ART_1000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_defaultmac_0 (-1)>, <&precal_ART_1000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 
 &pcie1 {
        status = "okay";
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_defaultmac_0 0>, <&precal_ART_5000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_defaultmac_0 0>, <&precal_ART_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
index 3c99472a097a843b3ba546aca61de61a782f006d..3230ddc9261e0093a6a25d90632dd56bea812732 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
@@ -458,40 +458,28 @@ switch@10 {
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 
 &pcie1 {
        status = "okay";
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_PRODUCTDATA_c>, <&precal_ART_5000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_PRODUCTDATA_c>, <&precal_ART_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
index ad9201d01811ce618605abd625201b71d178cb44..84e7e55c26183880400ab5d1a83a917cf5a5b1c6 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
@@ -519,40 +519,28 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_ART_1e>, <&precal_ART_1000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_ART_1e>, <&precal_ART_1000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 
 &pcie1 {
        status = "okay";
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&macaddr_ART_18>, <&precal_ART_5000>;
-                       nvmem-cell-names = "mac-address", "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&macaddr_ART_18>, <&precal_ART_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
index 6c7dc0936a2258bca3a059d0ec9ec2a2c7bf9193..bd4312cfa30ced70ecf92eaf8b608a3b2648c2f4 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
@@ -196,19 +196,13 @@
        /delete-property/ pinctrl-0;
        /delete-property/ pinctrl-names;
        /delete-property/ perst-gpios;
+};
 
-       bridge@0,0 {
-                       reg = <0x00000000 0 0 0 0>;
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       ranges;
-
-                       wifi@1,0 {
-                                       compatible = "qcom,ath10k";
-                                       status = "okay";
-                                       reg = <0x00010000 0 0 0 0>;
-                                       qcom,ath10k-calibration-variant = "Nokia-AC400i";
-                       };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               qcom,ath10k-calibration-variant = "Nokia-AC400i";
        };
 };
 
@@ -218,19 +212,13 @@
        /delete-property/ pinctrl-0;
        /delete-property/ pinctrl-names;
        /delete-property/ perst-gpios;
+};
 
-       bridge@0,0 {
-                       reg = <0x00000000 0 0 0 0>;
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       ranges;
-
-                       wifi@1,0 {
-                                       compatible = "qcom,ath10k";
-                                       status = "okay";
-                                       reg = <0x00010000 0 0 0 0>;
-                                       qcom,ath10k-calibration-variant = "Nokia-AC400i";
-                       };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               qcom,ath10k-calibration-variant = "Nokia-AC400i";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
index 589c04af2b684c9a5e555c0293b45bfe46f174f9..b4ffdcc79277e692e79d90b08e53841c3ce9f33e 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
@@ -540,17 +540,12 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi0: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-               };
+&pcie_bridge0 {
+       wifi0: wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
        };
 };
 
@@ -558,16 +553,11 @@
        status = "okay";
 
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi1: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-               };
+&pcie_bridge1 {
+       wifi1: wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
        };
 };

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
index 22624ce59ceb11317e75e4f52990f118709445ea..e4ee3d2f3bf2c31242af8893350db54382001614 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
@@ -578,20 +578,14 @@
        reset-gpios = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>;
        pinctrl-0 = <&pcie0_pins>;
        pinctrl-names = "default";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi0: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&precal_ART_1000>;
-                       nvmem-cell-names = "pre-calibration";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&precal_ART_1000>;
+               nvmem-cell-names = "pre-calibration";
        };
 };
 
@@ -601,19 +595,13 @@
        pinctrl-0 = <&pcie1_pins>;
        pinctrl-names = "default";
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi1: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&precal_ART_5000>;
-                       nvmem-cell-names = "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&precal_ART_5000>;
+               nvmem-cell-names = "pre-calibration";
        };
 };

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
index 95133b470986bd4ccc562cc7d8abd2bffbb36287..22b5381b482a4fe3c07e20baa35433c1196d0da6 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
@@ -476,20 +476,14 @@
        reset-gpios = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>;
        pinctrl-0 = <&pcie0_pins>;
        pinctrl-names = "default";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi0: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&precal_ART_1000>, <&macaddr_fw_env_12>;
-                       nvmem-cell-names = "pre-calibration", "mac-address";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&precal_ART_1000>, <&macaddr_fw_env_12>;
+               nvmem-cell-names = "pre-calibration", "mac-address";
        };
 };
 
@@ -499,19 +493,13 @@
        pinctrl-0 = <&pcie1_pins>;
        pinctrl-names = "default";
        max-link-speed = <1>;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi1: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       nvmem-cells = <&precal_ART_5000>, <&macaddr_fw_env_c>;
-                       nvmem-cell-names = "pre-calibration", "mac-address";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               nvmem-cells = <&precal_ART_5000>, <&macaddr_fw_env_c>;
+               nvmem-cell-names = "pre-calibration", "mac-address";
        };
 };

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
index 4a6fbf4f3f6b72c02eaeff8e371097df29a434ec..74054fedc87c7332596e8bbd831b2c3d69aab8b9 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
@@ -255,18 +255,12 @@
 
        /delete-property/ pinctrl-0;
        /delete-property/ pinctrl-names;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
        };
 };
 
@@ -275,18 +269,12 @@
 
        /delete-property/ pinctrl-0;
        /delete-property/ pinctrl-names;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi
index 2e7157533178ec905bd82df92b14adfbd77ddff5..231d688c3599300c6027f7be83d34a1b0c00a7f9 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi
@@ -72,52 +72,34 @@
 
 &pcie0 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x0 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi0: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x10000 0 0 0 0>;
-               };
+&pcie_bridge0 {
+       wifi0: wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
        };
 };
 
 &pcie1 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x0 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi1: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x10000 0 0 0 0>;
-               };
+&pcie_bridge1 {
+       wifi1: wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
        };
 };
 
 &pcie2 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x0 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x10000 0 0 0 0>;
-               };
+&pcie_bridge2 {
+       wifi2: wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
index b809a2fd1a25e7eac048435fa78adb84f9f5d6c9..eae96da7360f3403de4858a65d0e337bf4cd6965 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
@@ -229,19 +229,13 @@
        /delete-property/ pinctrl-0;
        /delete-property/ pinctrl-names;
        /delete-property/ perst-gpios;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-                       qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L";
-               };
+&pcie_bridge0 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L";
        };
 };
 
@@ -251,19 +245,13 @@
        /delete-property/ pinctrl-0;
        /delete-property/ pinctrl-names;
        /delete-property/ perst-gpios;
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-                       qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L";
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
index f3fa42be3aa31a15fab1ff9e79d0d1429a7eac46..28f7c4540f80f5812f175def3539139b3df59ea0 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
@@ -200,41 +200,29 @@
 
 &pcie1 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-                       qcom,ath10k-calibration-variant = "IgniteNet-SS-W2-AC2600";
-                       nvmem-cells = <&precal_art_1000>;
-                       nvmem-cell-names = "pre-calibration";
-               };
+&pcie_bridge1 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               qcom,ath10k-calibration-variant = "IgniteNet-SS-W2-AC2600";
+               nvmem-cells = <&precal_art_1000>;
+               nvmem-cell-names = "pre-calibration";
        };
 };
 
 &pcie2 {
        status = "okay";
+};
 
-       bridge@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-                       qcom,ath10k-calibration-variant = "IgniteNet-SS-W2-AC2600";
-                       nvmem-cells = <&precal_art_5000>;
-                       nvmem-cell-names = "pre-calibration";
-               };
+&pcie_bridge2 {
+       wifi@1,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x00010000 0 0 0 0>;
+               qcom,ath10k-calibration-variant = "IgniteNet-SS-W2-AC2600";
+               nvmem-cells = <&precal_art_5000>;
+               nvmem-cell-names = "pre-calibration";
        };
 };