[openwrt/openwrt] qualcommax: ipq807x: wax620 and wax630: fix wifi mac address

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/75a76355cb674209589f6a33f116b5424cac2cdc

commit 75a76355cb674209589f6a33f116b5424cac2cdc
Author: Kristian Skramstad <kristian+github at 83.no>
AuthorDate: Fri May 31 06:15:10 2024 +0200

    qualcommax: ipq807x: wax620 and wax630: fix wifi mac address
    
    The wifi radios on wax620 and wax630 got a random mac
    address on boot. So fix this by using ath11k_patch_mac
    and give a static mac address from label-mac-device.
    
    Tested and working on wax620 and wax630.
    
    Signed-off-by: Kristian Skramstad <kristian+github at 83.no>
    Link: https://github.com/openwrt/openwrt/pull/15597
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 .../files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts   |  2 ++
 .../base-files/etc/hotplug.d/firmware/11-ath11k-caldata | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
index ceb719d813..f410f79495 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
@@ -15,6 +15,8 @@
 	aliases {
 		serial0 = &blsp1_uart5;
 		ethernet0 = &dp6;
+		label-mac-device = &dp6;
+
 		led-boot = &led_system_blue;
 		led-failsafe = &led_system_red;
 		led-running = &led_system_green;
diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
index 106a86be75..758b0d9a34 100644
--- a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
@@ -20,8 +20,6 @@ case "$FIRMWARE" in
 	netgear,sxr80|\
 	netgear,sxs80|\
 	netgear,wax218|\
-	netgear,wax620|\
-	netgear,wax630|\
 	qnap,301w|\
 	redmi,ax6|\
 	xiaomi,ax3600|\
@@ -51,6 +49,21 @@ case "$FIRMWARE" in
 		ath11k_patch_mac $(mtd_get_mac_binary boarddata1 0x6) 2
 		ath11k_set_macflag
 		;;
+	netgear,wax620)
+		caldata_extract "0:art" 0x1000 0x20000
+		label_mac=$(get_mac_label)
+		ath11k_patch_mac $(macaddr_add $label_mac -31) 1
+		ath11k_patch_mac $(macaddr_add $label_mac 1) 0
+		ath11k_set_macflag
+		;;
+	netgear,wax630)
+		caldata_extract "0:art" 0x1000 0x20000
+		label_mac=$(get_mac_label)
+		ath11k_patch_mac $(macaddr_add $label_mac -31) 1
+		ath11k_patch_mac $(macaddr_add $label_mac 1) 0
+		ath11k_patch_mac $(macaddr_add $label_mac 33) 2
+		ath11k_set_macflag
+		;;
 	prpl,haze|\
 	spectrum,sax1v1k)
 		caldata_extract_mmc "0:ART" 0x1000 0x20000