Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath79: elecom,wab: use nvmem

Browse source 
Userspace handling is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16247
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2024-06-15 13:42:25 -07:00 committed by Hauke Mehrtens
parent 9bbaa6f2c0
commit 70e41d0205
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
target/linux/ath79/dts/qca955x_elecom_wab.dtsi
View file

@ -8,6 +8,7 @@
/ { / {
aliases { aliases {
label-mac-device = &eth0;
led-boot = &led_status; led-boot = &led_status;
led-failsafe = &led_status; led-failsafe = &led_status;
led-upgrade = &led_status; led-upgrade = &led_status;
@ -107,6 +108,9 @@
phy-mode = "rgmii-rxid"; phy-mode = "rgmii-rxid";
pll-data = <0xae000000 0x80000101 0x80001313>; pll-data = <0xae000000 0x80000101 0x80001313>;
nvmem-cells = <&macaddr_uboot_ethaddr 0>;
nvmem-cell-names = "mac-address";
gmac-config { gmac-config {
device = <&gmac>; device = <&gmac>;
@ -144,8 +148,8 @@
wifi@0,0 { wifi@0,0 {
compatible = "qcom,ath10k"; compatible = "qcom,ath10k";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&cal_art_5000>; nvmem-cells = <&cal_art_5000>, <&macaddr_uboot_ethaddr 1>;
nvmem-cell-names = "calibration"; nvmem-cell-names = "calibration", "mac-address";
}; };
}; };
@ -169,9 +173,14 @@
}; };
partition@40000 { partition@40000 {
compatible = "u-boot,env";
label = "u-boot-env"; label = "u-boot-env";
reg = <0x40000 0x10000>; reg = <0x40000 0x10000>;
read-only; read-only;
macaddr_uboot_ethaddr: ethaddr {
#nvmem-cell-cells = <1>;
};
}; };
partition@50000 { partition@50000 {
@ -252,6 +261,6 @@
&wmac { &wmac {
status = "okay"; status = "okay";
nvmem-cells = <&cal_art_1000>; nvmem-cells = <&cal_art_1000>, <&macaddr_uboot_ethaddr 0>;
nvmem-cell-names = "calibration"; nvmem-cell-names = "calibration", "mac-address";
}; };

3
target/linux/ath79/generic/base-files/etc/board.d/02_network
View file

@ -712,9 +712,6 @@ ath79_setup_macs()
lan_mac=$(mtd_get_mac_ascii devdata "lanmac") lan_mac=$(mtd_get_mac_ascii devdata "lanmac")
wan_mac=$(mtd_get_mac_ascii devdata "wanmac") wan_mac=$(mtd_get_mac_ascii devdata "wanmac")
;; ;;
elecom,wab-i1750-ps|\
elecom,wab-s1167-ps|\
elecom,wab-s600-ps|\
engenius,ecb1200|\ engenius,ecb1200|\
engenius,ecb1750) engenius,ecb1750)
lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)

10
target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
View file

@ -42,16 +42,6 @@ case "$board" in
[ "$PHYNBR" -eq 1 ] && \ [ "$PHYNBR" -eq 1 ] && \
mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
;; ;;
elecom,wab-i1750-ps|\
elecom,wab-s1167-ps|\
elecom,wab-s600-ps)
# set the 5G MAC address (= ethaddr + 1)
[ "$PHYNBR" -eq 0 ] && \
macaddr_add "$(mtd_get_mac_ascii u-boot-env ethaddr)" 1 > /sys${DEVPATH}/macaddress
# set the 2.4G MAC address (= ethaddr)
[ "$PHYNBR" -eq 1 ] && \
mtd_get_mac_ascii u-boot-env "ethaddr" > /sys${DEVPATH}/macaddress
;;
engenius,ecb1200|\ engenius,ecb1200|\
engenius,ecb1750) engenius,ecb1750)
[ "$PHYNBR" -eq 0 ] && \ [ "$PHYNBR" -eq 0 ] && \