[openwrt/openwrt] ath79: D-Link DAP-3662 A1: convert ath10k caldata to nvmem

[LEDE Commits]

svanheule pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7868f7ad0f5008a7c2fb58c3f975f2ab280b8596

commit 7868f7ad0f5008a7c2fb58c3f975f2ab280b8596
Author: Sander Vanheule <sander at svanheule.net>
AuthorDate: Sat Jun 11 12:52:37 2022 +0200

    ath79: D-Link DAP-3662 A1: convert ath10k caldata to nvmem
    
    Add the PCIe node for the ath10k radio to the devicetree, and refer to
    the art partition for the calibration data using nvmem-cells.
    
    MAC address assignment is moved to '10_fix_wifi_mac', so the device can
    then be removed from the caldata extraction script '11-ath10k-caldata'.
    
    Cc: Sebastian Schaper <openwrt at sebastianschaper.net>
    Signed-off-by: Sander Vanheule <sander at svanheule.net>
---
 target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts       | 14 ++++++++++++++
 .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata    |  4 ----
 .../base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac     |  7 ++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts
index 1ecc987a4f..27883f721c 100644
--- a/target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts
@@ -93,4 +93,18 @@
 
 &pcie0 {
 	status = "okay";
+
+	wifi at 0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0 0 0 0 0>;
+
+		nvmem-cells = <&cal_ath10k>;
+		nvmem-cell-names = "calibration";
+	};
+};
+
+&art {
+	cal_ath10k: calibration at 5000 {
+		reg = <0x5000 0x844>;
+	};
 };
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 621f0c62b0..5c42ae4fac 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -67,10 +67,6 @@ case "$FIRMWARE" in
 		caldata_extract "art" 0x5000 0x844
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) -1)
 		;;
-	dlink,dap-3662-a1)
-		caldata_extract "art" 0x5000 0x844
-		ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac_a)
-		;;
 	dlink,dir-859-a1)
 		caldata_extract "art" 0x5000 0x844
 		ath10k_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac")
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index fc74d3dd4a..95ff6083c7 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -26,13 +26,10 @@ case "$board" in
 	dlink,dap-3320-a1)
 		mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
 		;;
-	dlink,dap-3662-a1)
-		[ "$PHYNBR" -eq 1 ] && \
-			mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
-		;;
 	dlink,dap-2660-a1|\
 	dlink,dap-2680-a1|\
-	dlink,dap-2695-a1)
+	dlink,dap-2695-a1|\
+	dlink,dap-3662-a1)
 		[ "$PHYNBR" -eq 0 ] && \
 			mtd_get_mac_ascii bdcfg "wlanmac_a" > /sys${DEVPATH}/macaddress
 		[ "$PHYNBR" -eq 1 ] && \