aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiji Yang <yangshiji66@qq.com>2022-11-29 18:13:19 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2022-12-06 23:11:23 +0100
commit58088ff457afff5fcfa4b32f00c44593f4b7b2c1 (patch)
treeb4027b7e88da2edbccc673119af3b93e64ac58c9
parentf72be4524d2c74a34eaea67edb45fbe745b48bba (diff)
downloadupstream-58088ff457afff5fcfa4b32f00c44593f4b7b2c1.tar.gz
upstream-58088ff457afff5fcfa4b32f00c44593f4b7b2c1.tar.bz2
upstream-58088ff457afff5fcfa4b32f00c44593f4b7b2c1.zip
ath79: convert Netgear R6100 radio calibration to nvmem-cells
use nvmem-cells implementation to avoid copying art calibration data to rootfs. Tested on Netgear R6100 Signed-off-by: Shiji Yang <yangshiji66@qq.com>
-rw-r--r--target/linux/ath79/dts/ar9344_netgear_r6100.dts15
-rw-r--r--target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata3
2 files changed, 12 insertions, 6 deletions
diff --git a/target/linux/ath79/dts/ar9344_netgear_r6100.dts b/target/linux/ath79/dts/ar9344_netgear_r6100.dts
index a73ea52de9..76bd77d4c6 100644
--- a/target/linux/ath79/dts/ar9344_netgear_r6100.dts
+++ b/target/linux/ath79/dts/ar9344_netgear_r6100.dts
@@ -181,8 +181,8 @@
compatible = "qcom,ath10k";
reg = <0x0000 0 0 0 0>;
- nvmem-cells = <&macaddr_caldata_c>;
- nvmem-cell-names = "mac-address";
+ nvmem-cells = <&cal_ath10k>, <&macaddr_caldata_c>;
+ nvmem-cell-names = "calibration", "mac-address";
};
};
@@ -201,7 +201,8 @@
&wmac {
status = "okay";
- mtd-cal-data = <&caldata 0x1000>;
+ nvmem-cells = <&cal_ath9k>;
+ nvmem-cell-names = "calibration";
};
&caldata {
@@ -209,6 +210,14 @@
#address-cells = <1>;
#size-cells = <1>;
+ cal_ath9k: calibration@1000 {
+ reg = <0x1000 0x440>;
+ };
+
+ cal_ath10k: calibration@5000 {
+ reg = <0x5000 0x844>;
+ };
+
macaddr_caldata_0: macaddr@0 {
reg = <0x0 0x6>;
};
diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index e5c26d6bb5..d26625981e 100644
--- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -18,9 +18,6 @@ case "$FIRMWARE" in
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) 1)
;;
- netgear,r6100)
- caldata_extract "caldata" 0x5000 0x844
- ;;
zyxel,emg2926-q10a|\
zyxel,nbg6716)
caldata_extract "art" 0x5000 0x844