ath79: mynet-wifi-rangeextender: use nvmem

Convert the last remaining userspace eeprom for ath9k to nvmem. Well,
easily converted at least.

wifi MAC has to be handled in userspace as the kernel nvram driver works
on memory mapped addresses, not mtd ones.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/14666
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
index 67ff1c9d07e8ca44de1a72879a731d7d14e521e4..598781ae681e4e9cfc30063a55856fc12b887863 100644 (file)
--- a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
+++ b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
@@ -118,6 +118,16 @@
                                label = "art";
                                reg = <0x7f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
                        };
                };
        };
@@ -129,8 +139,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
-               /* wifi MAC is stored in nvram */
+               nvmem-cells = <&cal_art_1000>;
+               nvmem-cell-names = "calibration";
        };
 };
 

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 a8443cf163e7fcc9d44e1c7257809f9e0a3bf4d1..2fd334ef3209978a50ced8451d4a2179bc8422cf 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
@@ -25,10 +25,6 @@ case "$FIRMWARE" in
        avm,fritz300e)
                caldata_extract_reverse "urloader" 0x1541 0x440
                ;;
-       wd,mynet-wifi-rangeextender)
-               caldata_extract "art" 0x1000 0x440
-               ath9k_patch_mac $(nvram get wl0_hwaddr)
-               ;;
        *)
                caldata_die "board $board is not supported yet"
                ;;

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 0ef322e898ec8d3c7a6a4dfe21457fabf386a62e..31fd1890a66defb24516a34ff9a53ac967773733 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
@@ -110,6 +110,9 @@ case "$board" in
                [ "$PHYNBR" -eq 1 ] && \
                        macaddr_add $base_mac 1 > /sys${DEVPATH}/macaddress
                ;;
+       wd,mynet-wifi-rangeextender)
+               echo $(nvram get wl0_hwaddr) > /sys${DEVPATH}/macaddress
+               ;;
        wd,mynet-n600|\
        wd,mynet-n750)
                [ "$PHYNBR" -eq 0 ] && \