ath79: whr-g301n: use nvmem for eeprom

Userspace handling for this is deprecated.

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

diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
index fe72ad21e889cef63c6f0506e7cb19807a56ee70..a72a89a2183b102806dcd1edfb0398c36538078e 100644 (file)
--- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
+++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
@@ -156,6 +156,10 @@
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0xeb8>;
+                                       };
+
                                        macaddr_art_120c: macaddr@120c {
                                                compatible = "mac-base";
                                                reg = <0x120c 0x6>;
@@ -185,9 +189,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
-               nvmem-cells = <&macaddr_art_120c 0>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&cal_art_1000>, <&macaddr_art_120c 0>;
+               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 e7b9ed2563c2dc4f723e18c738a03f85c0dd0e07..6976a24c07bd710c2ff8d726827fbd337e76c97b 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
-       buffalo,whr-g301n|\
        engenius,eap350-v1|\
        engenius,ecb350-v1|\
        engenius,enh202-v1)