ath79: dlink,dir-615-e4: use nvmem

Userspace handling is deprecated.

Move the mac address patch to 10_fix_wifi_mac.

This uses an AR9287, which uses a smaller size for its calibration.

The PCI ID is also wrong.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19864
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
index 4a709395e968a7a60e7a94f8405d8dc991df5783..18eb6f8c745d1c3ff33e2ac781058573d6fd10ba 100644 (file)
--- a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
+++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
@@ -138,6 +138,16 @@
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x3d8>;
+                                       };
+                               };
                        };
                };
        };
@@ -151,9 +161,10 @@
        status = "okay";
 
        ath9k: wifi@0,0 {
-               compatible = "pci168c,002b";
+               compatible = "pci168c,002e";
                reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
+               nvmem-cells = <&cal_art_1000>;
+               nvmem-cell-names = "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };

diff --git a/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 6976a24c07bd710c2ff8d726827fbd337e76c97b..ccbaafda72db2dc58565cdfa1dc7b80a69594c87 100644 (file)
--- a/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -14,10 +14,6 @@ case "$FIRMWARE" in
        engenius,enh202-v1)
                caldata_extract "art" 0x1000 0xeb8
                ;;
-       dlink,dir-615-e4)
-               caldata_extract "art" 0x1000 0x1000
-               ath9k_patch_mac_crc $(mtd_get_mac_ascii "nvram" "lan_mac") 0x10c
-               ;;
        netgear,wnr2000-v3|\
        ubnt,airrouter|\
        ubnt,bullet-m-ar7240|\

diff --git a/target/linux/ath79/tiny/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ath79/tiny/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
new file mode 100755 (executable)
index 0000000..0a950d8
--- /dev/null
+++ b/target/linux/ath79/tiny/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -0,0 +1,19 @@
+#!/bin/ash
+
+[ "$ACTION" = "add" ] || exit 0
+
+PHYNBR=${DEVPATH##*/phy}
+
+[ -n $PHYNBR ] || exit 0
+
+. /lib/functions.sh
+. /lib/functions/system.sh
+
+board=$(board_name)
+
+case "$board" in
+       dlink,dir-615-e4)
+               [ "$PHYNBR" -eq 0 ] && \
+                       mtd_get_mac_ascii "nvram" "lan_mac" > /sys${DEVPATH}/macaddress
+               ;;
+esac