ipq806x: fix wifi node

In the conversion to nvmem of eax500 and unifi-ac-hd, the address was
set to 0 as is the case with most platforms, but not this one.

The wifi node also needs to be wrapped in a bridge node.

Matches every other device in ipq806x.

Fixes: 148f82ad4525 ("ipq806x: use nvmem for wifi mac")
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20325
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
index 59f6dc8698e9be1167d160ac7891dc84b5efb7b7..b4f14d8a0baf16ab35dcb3493e949a2c5bbbd118 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
@@ -53,22 +53,36 @@
 
        max-link-speed = <1>;
 
-       wifi@0,0 {
-               compatible = "qcom,ath10k";
-               reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&precal_art_1000>;
-               nvmem-cell-names = "pre-calibration";
+       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";
+               };
        };
 };
 
 &pcie1 {
        status = "okay";
 
-       wifi@0,0 {
-               compatible = "qcom,ath10k";
-               reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&precal_art_5000>;
-               nvmem-cell-names = "pre-calibration";
+       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";
+               };
        };
 };
 

diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
index c415b5901ad39c94fd8c82b42072b7572e1eeef0..3a1ad07ecdfb66cb70251baccd02f484e22edf1d 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
@@ -283,22 +283,38 @@
 &pcie0 {
        status = "okay";
 
-       wifi@0,0 {
-               compatible = "qcom,ath10k";
-               reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_eeprom_6 1>;
-               nvmem-cell-names = "mac-address";
+       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";
+               };
        };
 };
 
 &pcie1 {
        status = "okay";
 
-       wifi@0,0 {
-               compatible = "qcom,ath10k";
-               reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_eeprom_6 2>;
-               nvmem-cell-names = "mac-address";
+       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";
+               };
        };
 };