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@sebastianschaper.net>
Signed-off-by: Sander Vanheule <sander@svanheule.net>

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 1ecc987a4f2cf0362f10606f7e8b2a695dddfc7e..27883f721cf55fdb98269f0f762d0a0da32a068e 100644 (file)
--- 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@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0 0 0 0 0>;
+
+               nvmem-cells = <&cal_ath10k>;
+               nvmem-cell-names = "calibration";
+       };
+};
+
+&art {
+       cal_ath10k: calibration@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 621f0c62b001375f3b1af36598548ba6d1bc1413..5c42ae4fac13cd7c8194b9b45e2fc310135f8517 100644 (file)
--- 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 fc74d3dd4a00f18b1f0f979567bee7afca3aa363..95ff6083c7f8c5e67c22514f00a43e979bf12019 100644 (file)
--- 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 ] && \