ath79: use nvmem for wrong 3e0 cal size

These three devices use AR9287 chips, which have a calibration size of 3d8.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17278
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2024-12-14 17:07:36 -08:00 committed by Hauke Mehrtens
parent 0e2dcfc4f4
commit 5c76e63f19
5 changed files with 24 additions and 13 deletions

View File

@ -50,6 +50,10 @@
macaddr_art_6: macaddr@6 { macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>; reg = <0x6 0x6>;
}; };
cal_art_1000: calibration@1000 {
reg = <0x1000 0x3d8>;
};
}; };
}; };
}; };
@ -65,6 +69,6 @@
}; };
&ath9k { &ath9k {
nvmem-cells = <&macaddr_art_0 1>; nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address", "calibration";
}; };

View File

@ -50,6 +50,10 @@
macaddr_art_6: macaddr@6 { macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>; reg = <0x6 0x6>;
}; };
cal_art_1000: calibration@1000 {
reg = <0x1000 0x3d8>;
};
}; };
}; };
}; };
@ -65,6 +69,6 @@
}; };
&ath9k { &ath9k {
nvmem-cells = <&macaddr_art_0 1>; nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address", "calibration";
}; };

View File

@ -173,7 +173,6 @@
ath9k: wifi@0,0 { ath9k: wifi@0,0 {
compatible = "pci168c,002e"; compatible = "pci168c,002e";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
qca,no-eeprom;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;

View File

@ -128,6 +128,16 @@
reg = <0x7f0000 0x10000>; reg = <0x7f0000 0x10000>;
label = "art"; label = "art";
read-only; read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: calibration@1000 {
reg = <0x1000 0x3d8>;
};
};
}; };
}; };
}; };
@ -141,9 +151,8 @@
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
qca,no-eeprom; nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
nvmem-cells = <&macaddr_uboot_1fc00 0>; nvmem-cell-names = "mac-address", "calibration";
nvmem-cell-names = "mac-address";
}; };
}; };

View File

@ -83,11 +83,6 @@ case "$FIRMWARE" in
meraki,mr12) meraki,mr12)
caldata_extract "art" 0x11000 0xeb8 caldata_extract "art" 0x11000 0xeb8
;; ;;
netgear,wnr2200-8m|\
netgear,wnr2200-16m|\
tplink,tl-wr842n-v1)
caldata_extract "art" 0x1000 0x3e0
;;
ubnt,powerbridge-m|\ ubnt,powerbridge-m|\
ubnt,rocket-m) ubnt,rocket-m)
caldata_extract "art" 0x1000 0x1000 caldata_extract "art" 0x1000 0x1000