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

[LEDE Commits]

svanheule pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8ccbc95d5021a638d6c6611e04dcbec15aae2379

commit 8ccbc95d5021a638d6c6611e04dcbec15aae2379
Author: Sander Vanheule <sander at svanheule.net>
AuthorDate: Sat Jun 11 11:56:26 2022 +0200

    ath79: D-Link DAP-2680 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 pre-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>
    Tested-by: Sebastian Schaper <openwrt at sebastianschaper.net>
    Signed-off-by: Sander Vanheule <sander at svanheule.net>
---
 target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts       | 14 ++++++++++++++
 .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata    |  6 ------
 .../base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac     |  7 ++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
index 0593fd29f4..c398dd637f 100644
--- a/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
@@ -79,4 +79,18 @@
 
 &pcie0 {
 	status = "okay";
+
+	wifi at 0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0 0 0 0 0>;
+
+		nvmem-cells = <&precal_ath10k>;
+		nvmem-cell-names = "pre-calibration";
+	};
+};
+
+&art {
+	precal_ath10k: pre-calibration at 5000 {
+		reg = <0x5000 0x2f20>;
+	};
 };
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 cb4a5797ec..1ce3f00c7e 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
@@ -197,12 +197,6 @@ case "$FIRMWARE" in
 			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
 		rm /lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
 		;;
-	dlink,dap-2680-a1)
-		caldata_extract "art" 0x5000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac_a)
-		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
-			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-		;;
 	dlink,dir-842-c1|\
 	dlink,dir-842-c2|\
 	dlink,dir-842-c3)
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 a4f82c54e2..d5a2471a99 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
@@ -27,12 +27,17 @@ case "$board" in
 		mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
 		;;
 	dlink,dap-2660-a1|\
-	dlink,dap-2680-a1|\
 	dlink,dap-2695-a1|\
 	dlink,dap-3662-a1)
 		[ "$PHYNBR" -eq 1 ] && \
 			mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
 		;;
+	dlink,dap-2680-a1)
+		[ "$PHYNBR" -eq 0 ] && \
+			mtd_get_mac_ascii bdcfg "wlanmac_a" > /sys${DEVPATH}/macaddress
+		[ "$PHYNBR" -eq 1 ] && \
+			mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
+		;;
 	iodata,wn-ac1600dgr)
 		# There is no eeprom data for 5 GHz wlan in "art" partition
 		# which would allow to patch the macaddress