Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ath79: convert ath10k pre-calibration data to NVMEM (built-in MAC)

Browse source 
This patch converts ath10k pre-calibration data to NVMEM format for
wave 2 devices with built-in MAC address. The "pre-calibration"
NVMEM cell size is 0x2f20.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
This commit is contained in:
Shiji Yang 2024-02-01 19:39:51 +08:00 committed by Christian Marangi
parent 3c7ce20d5c
commit 650d37a809
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
5 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
target/linux/ath79/dts/qca9531_asus_rp-ac51.dts
View file

@ -65,6 +65,13 @@
&pcie0 { &pcie0 {
status = "okay"; status = "okay";
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x0000 0 0 0 0>;
nvmem-cells = <&precal_art_5000>;
nvmem-cell-names = "pre-calibration";
};
}; };
&spi { &spi {
@ -109,6 +116,10 @@
macaddr_art_1002: macaddr@1002 { macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>; reg = <0x1002 0x6>;
}; };
precal_art_5000: pre-calibration@5000 {
reg = <0x5000 0x2f20>;
};
}; };
}; };

11
target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
View file

@ -118,6 +118,10 @@
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>; reg = <0x0 0x6>;
}; };
precal_art_5000: pre-calibration@5000 {
reg = <0x5000 0x2f20>;
};
}; };
}; };
@ -183,4 +187,11 @@
&pcie { &pcie {
status = "okay"; status = "okay";
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x0000 0 0 0 0>;
nvmem-cells = <&precal_art_5000>;
nvmem-cell-names = "pre-calibration";
};
}; };

7
target/linux/ath79/dts/qca9563_yuncore_xd3200.dts
View file

@ -30,3 +30,10 @@
}; };
}; };
}; };
&pcie {
wifi@0,0 {
/delete-property/ nvmem-cells;
/delete-property/ nvmem-cell-names;
};
};

6
target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
View file

@ -57,6 +57,8 @@
wifi@0,0 { wifi@0,0 {
compatible = "pci168c,0056"; compatible = "pci168c,0056";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&precal_art_5000>;
nvmem-cell-names = "pre-calibration";
}; };
}; };
@ -103,6 +105,10 @@
macaddr_art_0: macaddr@0 { macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>; reg = <0x0 0x6>;
}; };
precal_art_5000: pre-calibration@5000 {
reg = <0x5000 0x2f20>;
};
}; };
}; };
}; };

12
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file

@ -173,13 +173,6 @@ case "$FIRMWARE" in
;; ;;
"ath10k/pre-cal-pci-0000:00:00.0.bin") "ath10k/pre-cal-pci-0000:00:00.0.bin")
case $board in case $board in
asus,rp-ac51|\
yuncore,a782|\
yuncore,xd4200)
caldata_extract "art" 0x5000 0x2f20
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;;
comfast,cf-e313ac) comfast,cf-e313ac)
caldata_extract "art" 0x5000 0x2f20 caldata_extract "art" 0x5000 0x2f20
ath10k_patch_mac $(mtd_get_mac_binary art 0x6) ath10k_patch_mac $(mtd_get_mac_binary art 0x6)
@ -237,11 +230,6 @@ case "$FIRMWARE" in
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;; ;;
xiaomi,aiot-ac2350)
caldata_extract "art" 0x5000 0x2f20
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9984/hw1.0/board.bin
;;
tplink,deco-m4r-v1) tplink,deco-m4r-v1)
caldata_extract "art" 0x5000 0x2f20 caldata_extract "art" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary config 0x8) -1) ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary config 0x8) -1)