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>

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 53b1e03da6346b36f12822c12470b12abf6d429d..0317f1eabb71ee8fa109dedcfb98598278e204b5 100644 (file)
--- 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 9a3054e2765efd90c2a3d576681e93bc802305bf..da78e74dcb5c97b42915194b528b68a647b5913b 100644 (file)
--- 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 ac8b59c538b6b677e9c406cc57b8fb55e465d012..a4f82c54e271ca760512f10352b70336634012b0 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
@@ -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