ath79: aruba,ap115: use nvmem

Userspace handling is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16284
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2023-11-27 11:40:48 -08:00 committed by Hauke Mehrtens
parent 94d775d01a
commit be2be0f32e
2 changed files with 13 additions and 13 deletions

View File

@ -98,10 +98,9 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "pci168c,0033"; compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
qca,no-eeprom;
nvmem-cells = <&macaddr_oemdata_1d 1>; nvmem-cells = <&macaddr_oemdata_1d 1>, <&cal_oemdata_5000>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address", "calibration";
}; };
}; };
@ -161,7 +160,7 @@
reg = <0x100000 0xe00000>; reg = <0x100000 0xe00000>;
}; };
oemdata: partition@fe0000 { partition@fe0000 {
label = "oemdata"; label = "oemdata";
reg = <0xfe0000 0x010000>; reg = <0xfe0000 0x010000>;
read-only; read-only;
@ -176,6 +175,14 @@
reg = <0x1d 0x6>; reg = <0x1d 0x6>;
#nvmem-cell-cells = <1>; #nvmem-cell-cells = <1>;
}; };
cal_oemdata_1000: calibration@1000 {
reg = <0x1000 0x440>;
};
cal_oemdata_5000: calibration@5000 {
reg = <0x5000 0x440>;
};
}; };
}; };
@ -190,9 +197,8 @@
&wmac { &wmac {
status = "okay"; status = "okay";
qca,no-eeprom; nvmem-cells = <&macaddr_oemdata_1d 0>, <&cal_oemdata_1000>;
nvmem-cells = <&macaddr_oemdata_1d 0>; nvmem-cell-names = "mac-address", "calibration";
nvmem-cell-names = "mac-address";
}; };
&mdio0 { &mdio0 {

View File

@ -9,9 +9,6 @@ board=$(board_name)
case "$FIRMWARE" in case "$FIRMWARE" in
"ath9k-eeprom-ahb-18100000.wmac.bin") "ath9k-eeprom-ahb-18100000.wmac.bin")
case $board in case $board in
aruba,ap-115)
caldata_extract "oemdata" 0x1000 0x440
;;
asus,pl-ac56|\ asus,pl-ac56|\
asus,rp-ac51|\ asus,rp-ac51|\
asus,rp-ac66) asus,rp-ac66)
@ -73,9 +70,6 @@ case "$FIRMWARE" in
;; ;;
"ath9k-eeprom-pci-0000:00:00.0.bin") "ath9k-eeprom-pci-0000:00:00.0.bin")
case $board in case $board in
aruba,ap-115)
caldata_extract "oemdata" 0x5000 0x440
;;
avm,fritz300e) avm,fritz300e)
caldata_extract_reverse "urloader" 0x1541 0x440 caldata_extract_reverse "urloader" 0x1541 0x440
;; ;;