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@83.no>
Link: https://github.com/openwrt/openwrt/pull/15597
Signed-off-by: Robert Marko <robimarko@gmail.com>

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 ceb719d81322e1ef9f3dab7eef9fba9c0d8efd26..f410f79495ef1800d2afd480d600a2897bead28b 100644 (file)
--- 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 106a86be758a6a139f519e38dd248964e03d4846..758b0d9a346c57de4e004224701ff2f0a9803d11 100644 (file)
--- 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