diff options
| author | Sebastian Schaper <openwrt@sebastianschaper.net> | 2021-08-25 22:00:08 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-20 21:08:25 +0100 |
| commit | be88f416db0a7ba7064c1b8bcb9556452d0729d3 (patch) | |
| tree | 31821612cc02a6340c8a8a5bbbf19b0cd8012754 | |
| parent | 3d896850885d3d721018aa742b1c7471155b78f0 (diff) | |
| download | upstream-be88f416db0a7ba7064c1b8bcb9556452d0729d3.tar.gz upstream-be88f416db0a7ba7064c1b8bcb9556452d0729d3.tar.bz2 upstream-be88f416db0a7ba7064c1b8bcb9556452d0729d3.zip | |
ath79: move cal-data extraction to dts for DAP-2695
This device can be merged with the existing dtsi, which declares
the location of ath9k cal-data via devicetree, correcting the 2.4G
mac address in `10_fix_wifi_mac` rather than `10-ath9k-eeprom`.
To make these changes more visible, apply before merging with dtsi.
Signed-off-by: Sebastian Schaper <openwrt@sebastianschaper.net>
3 files changed, 2 insertions, 5 deletions
diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts index 53b1e03da6..0317f1eabb 100644 --- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts +++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts @@ -160,5 +160,5 @@ &wmac { status = "okay"; - qca,no-eeprom; + mtd-cal-data = <&art 0x1000>; }; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 9a3054e276..da78e74dcb 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -18,10 +18,6 @@ case "$FIRMWARE" in avm,fritzdvbc) caldata_extract_reverse "urlader" 0x1541 0x440 ;; - dlink,dap-2695-a1) - caldata_extract "art" 0x1000 0x440 - ath9k_patch_mac $(mtd_get_mac_ascii bdcfg "wlanmac") - ;; dlink,dir-505|\ dlink,dir-825-c1|\ dlink,dir-835-a1) 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 ac8b59c538..a4f82c54e2 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 @@ -28,6 +28,7 @@ case "$board" in ;; 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 |