ath79: ews511ap: use nvmem

Userspace handling is deprecated.

This is a weird one. It should be using u-boot,env, but the variable
name is unknown. Keep it as is.

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

diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
index f84f8b084bca127c53ecaebc668adab8a3a10f5a..ba51982156c954eef1cbb02a20e281d1838f9945 100644 (file)
--- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
+++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
@@ -82,8 +82,8 @@
        wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&cal_art_5000>;
-               nvmem-cell-names = "calibration";
+               nvmem-cells = <&cal_art_5000>, <&macaddr_uboot_e9 1>;
+               nvmem-cell-names = "calibration", "mac-address";
        };
 };
 
@@ -109,6 +109,18 @@
                        ubootenv: partition@40000 {
                                label = "u-boot-env";
                                reg = <0x040000 0x010000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_e9: macaddr@e9 {
+                                               compatible = "mac-base";
+                                               reg = <0xe9 0x11>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -144,6 +156,14 @@
        status = "okay";
 
        phy-handle = <&swphy4>;
+
+       nvmem-cells = <&macaddr_uboot_e9 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&eth1 {
+       nvmem-cells = <&macaddr_uboot_e9 1>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {

diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index fef96060a825d0bb5efe95a1423f71e919c82f31..fa158b839c5a570081ffef7dc4a9f53cdf754001 100644 (file)
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -739,12 +739,6 @@ ath79_setup_macs()
        engenius,esr900)
                wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
                ;;
-       engenius,ews511ap)
-               lan_mac=$(mtd_get_mac_text "u-boot-env" 0xe9)
-               eth1_mac=$(macaddr_add "$lan_mac" 1)
-               ucidef_set_interface "eth0" ifname "eth0" protocol "none" macaddr "$lan_mac"
-               ucidef_set_interface "eth1" ifname "eth1" protocol "none" macaddr "$eth1_mac"
-               ;;
        hak5,lan-turtle|\
        hak5,packet-squirrel)
                label_mac=$(mtd_get_mac_binary u-boot 0x1fc00)

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 291241b6ee3dc7618435c66ea2ee717dbf4a6b1b..6153599907d964209c197ca450c91b6ff00292fc 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
@@ -52,10 +52,6 @@ case "$board" in
                [ "$PHYNBR" -eq 0 ] && \
                        mtd_get_mac_ascii u-boot-env athaddr > /sys${DEVPATH}/macaddress
                ;;
-       engenius,ews511ap)
-               [ "$PHYNBR" -eq 0 ] && \
-               macaddr_add $(cat /sys/class/net/eth0/address) 1 > /sys${DEVPATH}/macaddress
-               ;;
        enterasys,ws-ap3705i)
                [ "$PHYNBR" -eq 0 ] && \
                        mtd_get_mac_ascii u-boot-env0 RADIOADDR1 > /sys${DEVPATH}/macaddress