ath79: convert pcs,cap324 calibration to nvmem

Userspace handling is deprecated.

Also fix a bug with userspace handling where the wrong calibration data
was being used for the PCI card. The dts was correct but userspace was
not.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2024-02-17 21:22:13 -08:00 committed by Hauke Mehrtens
parent 6483615580
commit 79fc4dba60
2 changed files with 14 additions and 10 deletions

View File

@ -110,7 +110,7 @@
reg = <0x050000 0x0fa0000>; reg = <0x050000 0x0fa0000>;
}; };
art: partition@7f0000 { partition@7f0000 {
label = "art"; label = "art";
reg = <0xff0000 0x010000>; reg = <0xff0000 0x010000>;
read-only; read-only;
@ -125,6 +125,14 @@
reg = <0x0 0x6>; reg = <0x0 0x6>;
#nvmem-cell-cells = <1>; #nvmem-cell-cells = <1>;
}; };
cal_art_1000: calibration@1000 {
reg = <0x1000 0x440>;
};
cal_art_5000: calibration@5000 {
reg = <0x5000 0x440>;
};
}; };
}; };
}; };
@ -137,10 +145,8 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "168c,0030"; compatible = "168c,0030";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&macaddr_art_0 (-2)>; nvmem-cells = <&macaddr_art_0 (-2)>, <&cal_art_5000>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address", "calibration";
mtd-cal-data = <&art 0x5000>;
qca,no-eeprom;
ieee80211-freq-limit = <2402000 2482000>; ieee80211-freq-limit = <2402000 2482000>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
@ -151,9 +157,8 @@
status = "okay"; status = "okay";
ieee80211-freq-limit = <4900000 5990000>; ieee80211-freq-limit = <4900000 5990000>;
mtd-cal-data = <&art 0x1000>; nvmem-cells = <&macaddr_art_0 (-1)>, <&cal_art_1000>;
nvmem-cells = <&macaddr_art_0 (-1)>; nvmem-cell-names = "mac-address", "calibration";
nvmem-cell-names = "mac-address";
}; };
&mdio0 { &mdio0 {

View File

@ -93,8 +93,7 @@ case "$FIRMWARE" in
avm,fritz300e) avm,fritz300e)
caldata_extract_reverse "urloader" 0x1541 0x440 caldata_extract_reverse "urloader" 0x1541 0x440
;; ;;
buffalo,wzr-hp-g450h|\ buffalo,wzr-hp-g450h)
pcs,cap324)
caldata_extract "art" 0x1000 0x440 caldata_extract "art" 0x1000 0x440
;; ;;
dlink,dir-825-c1|\ dlink,dir-825-c1|\