ath79: dir-8x5: use nvmem

Userspace handling is deprecated.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20176
Signed-off-by: Robert Marko <[email protected]>

diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
index e4eda6cde7630213a9e94950571497a6f004d053..891ea8fadc7fd99644ba6fd757b384eb4a49e1f2 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
@@ -58,13 +58,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               /* "mac-address" currently does not work for
-                  ath9k pci devices. these below are retained for future
-                  improvements. */
-               /* nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>;
-                  nvmem-cell-names = "mac-address", "calibration";
-                */
-               qca,no-eeprom; /* remove this when "mac-address" works  */
+               nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
        };
 };
 
@@ -109,7 +104,7 @@
                                read-only;
                        };
 
-                       mac: partition@fe0000 {
+                       partition@fe0000 {
                                label = "mac";
                                reg = <0xfe0000 0x010000>;
                                read-only;

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 63f10e0de36c17fbe4a243830aaf97253a8bab8b..b04c9499f3e5c4e6e00a08bc2198e7db176b2552 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
@@ -55,11 +55,6 @@ case "$FIRMWARE" in
        buffalo,wzr-hp-g450h)
                caldata_extract "art" 0x1000 0x440
                ;;
-       dlink,dir-825-c1|\
-       dlink,dir-835-a1)
-               caldata_extract "art" 0x5000 0x440
-               ath9k_patch_mac $(macaddr_add $(mtd_get_mac_text "mac" 0x18) 1)
-               ;;
        enterasys,ws-ap3705i)
                caldata_extract "calibrate" 0x5000 0x440
                ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env0 RADIOADDR0)