ath79: wnr200-v3: handle eeprom with nvmem

Userspace handling is deprecated.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20112
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
index 8550989250b365d87d6205572d012a373a17a066..ede370daa37549ad8d9e2c2fd94258f77f0956f9 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
@@ -193,6 +193,10 @@
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x3d8>;
+                                       };
                                };
                        };
                };
@@ -219,9 +223,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002e";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0 1>;
-               nvmem-cell-names = "mac-address";
-               qca,no-eeprom;
+               nvmem-cells = <&cal_art_1000>, <&macaddr_art_0 1>;
+               nvmem-cell-names = "calibration", "mac-address";
                #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 5e9ff10eba8599b31f553e2edaf053b7814c49b5..f55d9829e3f4f798c74b12f6e59400b6cb487346 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
@@ -9,7 +9,6 @@ board=$(board_name)
 case "$FIRMWARE" in
 "ath9k-eeprom-pci-0000:00:00.0.bin")
        case $board in
-       netgear,wnr2000-v3|\
        ubnt,airrouter|\
        ubnt,bullet-m-ar7240|\
        ubnt,bullet-m-ar7241|\