ipq806x: ac400i: use nvmem for MAC addresses

Userspace handling is deprecated. NVMEM allows flexibility in terms of
exotic setups by avoiding random MAC addresses.

u-boot env-size taken from the entry in uboot-envtools

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22107
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index add17e20826f723b7cd91db64df4b52d8bf139be..88161e5fa6c713fe229298d43f824af4347a212a 100644 (file)
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -47,10 +47,6 @@ case "$FIRMWARE" in
                CI_UBIPART=art
                caldata_extract_ubi "ART" 0x1000 0x2f20
                ;;
-       nokia,ac400i)
-               caldata_extract "0:art" 0x1000 0x2f20
-               ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) +2)
-               ;;
        zyxel,nbg6817)
                caldata_extract "0:art" 0x1000 0x2f20
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) 1)
@@ -78,10 +74,6 @@ case "$FIRMWARE" in
                CI_UBIPART=art
                caldata_extract_ubi "ART" 0x5000 0x2f20
                ;;
-       nokia,ac400i)
-               caldata_extract "0:art" 0x5000 0x2f20
-               ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) +3)
-               ;;
        zyxel,nbg6817)
                caldata_extract "0:art" 0x5000 0x2f20
                ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)

diff --git a/target/linux/ipq806x/dts/qcom-ipq8065-ac400i.dts b/target/linux/ipq806x/dts/qcom-ipq8065-ac400i.dts
index 5534231917ca2961cb92f3f74b3d2d43ef8f038c..3e13e4e76414f677a8a9f3132928af026a1fd8e7 100644 (file)
--- a/target/linux/ipq806x/dts/qcom-ipq8065-ac400i.dts
+++ b/target/linux/ipq806x/dts/qcom-ipq8065-ac400i.dts
@@ -175,6 +175,39 @@
 
                        partitions {
                                compatible = "qcom,smem-part";
+
+                               partition-0-art {
+                                       label = "0:art";
+                                       read-only;
+
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               precal_art_1000: pre-calibration@1000 {
+                                                       reg = <0x1000 0x2f20>;
+                                               };
+
+                                               precal_art_5000: pre-calibration@5000 {
+                                                       reg = <0x5000 0x2f20>;
+                                               };
+                                       };
+                               };
+
+                               partition-0-appsblenv {
+                                       label = "0:appsblenv";
+                                       read-only;
+
+                                       nvmem-layout {
+                                               compatible = "u-boot,env";
+                                               env-size = <0x40000>;
+
+                                               macaddr_uboot_ethaddr: ethaddr {
+                                                       #nvmem-cell-cells = <1>;
+                                               };
+                                       };
+                               };
                        };
                };
        };
@@ -201,6 +234,8 @@
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Nokia-AC400i";
+               nvmem-cells = <&precal_art_1000>, <&macaddr_uboot_ethaddr 2>;
+               nvmem-cell-names = "pre-calibration", "mac-address";
        };
 };
 
@@ -217,6 +252,8 @@
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Nokia-AC400i";
+               nvmem-cells = <&precal_art_5000>, <&macaddr_uboot_ethaddr 3>;
+               nvmem-cell-names = "pre-calibration", "mac-address";
        };
 };