ath79: ws-ap3705i: use nvmem

Userspace handling is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2024-02-17 20:58:33 -08:00
parent f6c45cdad0
commit db98af34ba
5 changed files with 32 additions and 16 deletions

View File

@ -113,7 +113,9 @@
&wmac {
status = "okay";
qca,no-eeprom;
nvmem-cells = <&cal_calibrate_1000>;
nvmem-cell-names = "calibration";
};
&spi {
@ -136,9 +138,13 @@
};
partition@80000 {
compatible = "u-boot,env";
label = "u-boot-env0";
reg = <0x80000 0x10000>;
read-only;
macaddr_uboot_ethaddr: ethaddr {
};
};
partition@90000 {
@ -157,6 +163,20 @@
label = "calibrate";
reg = <0x120000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
cal_calibrate_1000: calibration@1000 {
reg = <0x1000 0x440>;
};
cal_calibrate_5000: calibration@5000 {
reg = <0x5000 0x440>;
};
};
};
partition@130000 {
@ -196,7 +216,8 @@
ath9k: wifi@0,0 {
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
qca,no-eeprom;
nvmem-cells = <&cal_calibrate_5000>;
nvmem-cell-names = "calibration";
#gpio-cells = <2>;
gpio-controller;
};
@ -218,6 +239,9 @@
phy-mode = "rgmii";
phy-handle = <&phy0>;
nvmem-cells = <&macaddr_uboot_ethaddr>;
nvmem-cell-names = "mac-address";
gmac-config {
device = <&gmac>;
rgmii-gmac0 = <1>;

View File

@ -747,9 +747,6 @@ ath79_setup_macs()
ucidef_set_interface "eth0" ifname "eth0" protocol "none" macaddr "$lan_mac"
ucidef_set_interface "eth1" ifname "eth1" protocol "none" macaddr "$eth1_mac"
;;
enterasys,ws-ap3705i)
label_mac=$(mtd_get_mac_ascii u-boot-env0 ethaddr)
;;
hak5,lan-turtle|\
hak5,packet-squirrel)
label_mac=$(mtd_get_mac_binary u-boot 0x1fc00)

View File

@ -35,10 +35,6 @@ case "$FIRMWARE" in
caldata_extract "art" 0x1000 0x440
ath9k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env athaddr) 1)
;;
enterasys,ws-ap3705i)
caldata_extract "calibrate" 0x1000 0x440
ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env0 RADIOADDR1)
;;
extreme-networks,ws-ap3805i)
caldata_extract "art" 0x1000 0x440
ath9k_patch_mac $(mtd_get_mac_ascii cfg1 RADIOADDR1)
@ -74,10 +70,6 @@ case "$FIRMWARE" in
caldata_extract "art" 0x5000 0x440
ath9k_patch_mac $(macaddr_add $(mtd_get_mac_text "mac" 0x18) 1)
;;
enterasys,ws-ap3705i)
caldata_extract "calibrate" 0x5000 0x440
ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env0 RADIOADDR0)
;;
meraki,mr12)
caldata_extract "art" 0x11000 0xeb8
;;

View File

@ -67,6 +67,12 @@ case "$board" in
[ "$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
[ "$PHYNBR" -eq 1 ] && \
mtd_get_mac_ascii u-boot-env0 RADIOADDR0 > /sys${DEVPATH}/macaddress
;;
extreme-networks,ws-ap3805i)
[ "$PHYNBR" -eq 0 ] && \
mtd_get_mac_ascii cfg1 RADIOADDR0 > /sys${DEVPATH}/macaddress

View File

@ -18,9 +18,6 @@ preinit_set_mac_address() {
engenius,esr900)
ip link set dev eth0 address $(mtd_get_mac_ascii u-boot-env ethaddr)
;;
enterasys,ws-ap3705i)
ip link set dev eth0 address $(mtd_get_mac_ascii u-boot-env0 ethaddr)
;;
extreme-networks,ws-ap3805i|\
siemens,ws-ap3610)
ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)