aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorSander Vanheule <sander@svanheule.net>2022-06-11 12:52:37 +0200
committerSander Vanheule <sander@svanheule.net>2022-06-18 11:57:21 +0200
commit7868f7ad0f5008a7c2fb58c3f975f2ab280b8596 (patch)
tree877b4b37fb9c0c051165d0af632d569efca00e75 /target/linux/ath79
parente5df38120861f8064a8416d8e13bca0ca05eee76 (diff)
downloadupstream-7868f7ad0f5008a7c2fb58c3f975f2ab280b8596.tar.gz
upstream-7868f7ad0f5008a7c2fb58c3f975f2ab280b8596.tar.bz2
upstream-7868f7ad0f5008a7c2fb58c3f975f2ab280b8596.zip
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>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts14
-rw-r--r--target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata4
-rw-r--r--target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac7
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@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 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 ] && \