[openwrt/openwrt] ipq40xx: revert Cell-C RTL30VW to legacy caldata extraction

[LEDE Commits]

chunkeey pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/54e759d05d1496730d0807377203ca7dd2ab4b9d

commit 54e759d05d1496730d0807377203ca7dd2ab4b9d
Author: Pawel Dembicki <paweldembicki at gmail.com>
AuthorDate: Wed May 11 17:29:21 2022 +0200

    ipq40xx: revert Cell-C RTL30VW to legacy caldata extraction
    
    This partially reverts
    commit cfc13c44595d ("ipq40xx: utilize nvmem-cells for macs & (pre-)calibration data").
    
    After switching to nvmem RTL30VW, wifi was broken:
    
    [   19.118319] ath10k_ahb a000000.wifi: qca4019 hw1.0 target 0x01000000 chip_id 0x003b00ff sub 0000:0000
    [   19.118377] ath10k_ahb a000000.wifi: kconfig debug 0 debugfs 1 tracing 0 dfs 1 testmode 0
    [   19.130285] ath10k_ahb a000000.wifi: firmware ver 10.4b-ct-4019-fW-13-5ae337bb1 api 5 features mfp,peer-flow-ctrl,txstatus-noack,wmi-10.x-CT,ratemask-CT,regdump-CT,txrate-CT,flush-all-CT,pingpong-CT,ch-regs-CT,nop-CT,set-special-CT,tx-rc-CT,cust-stats-CT,txrate2-CT,beacon-cb-CT,wmi-block-ack-CT,wmi-bcn-rc-CT crc32 6b2b5c5b
    [   19.159092] ath10k_ahb a000000.wifi: failed to fetch board data for bus=ahb,vendor=0000,device=0000,subsystem-vendor=0000,subsystem-device=0000,variant=cellc,rtl30vw from ath10k/QCA4019/hw1.0/board-2.bin
    [   19.238764] ath10k_ahb a000000.wifi: failed to fetch board-2.bin or board.bin from ath10k/QCA4019/hw1.0
    [   19.238847] ath10k_ahb a000000.wifi: failed to fetch board file: -12
    [   19.247362] ath10k_ahb a000000.wifi: could not probe fw (-12)
    [   20.190797] ath10k_ahb a800000.wifi: qca4019 hw1.0 target 0x01000000 chip_id 0x003b00ff sub 0000:0000
    [   20.190853] ath10k_ahb a800000.wifi: kconfig debug 0 debugfs 1 tracing 0 dfs 1 testmode 0
    [   20.202893] ath10k_ahb a800000.wifi: firmware ver 10.4b-ct-4019-fW-13-5ae337bb1 api 5 features mfp,peer-flow-ctrl,txstatus-noack,wmi-10.x-CT,ratemask-CT,regdump-CT,txrate-CT,flush-all-CT,pingpong-CT,ch-regs-CT,nop-CT,set-special-CT,tx-rc-CT,cust-stats-CT,txrate2-CT,beacon-cb-CT,wmi-block-ack-CT,wmi-bcn-rc-CT crc32 6b2b5c5b
    [   20.231357] ath10k_ahb a800000.wifi: failed to fetch board data for bus=ahb,vendor=0000,device=0000,subsystem-vendor=0000,subsystem-device=0000,variant=cellc,rtl30vw from ath10k/QCA4019/hw1.0/board-2.bin
    [   20.317318] ath10k_ahb a800000.wifi: failed to fetch board-2.bin or board.bin from ath10k/QCA4019/hw1.0
    [   20.317399] ath10k_ahb a800000.wifi: failed to fetch board file: -12
    [   20.326098] ath10k_ahb a800000.wifi: could not probe fw (-12)
    
    Bootloader mangles in NAND partitions and removes precal at X nodes in
    working system:
    
    root at OpenWrt:~# echo $(cat /sys/firmware/devicetree/base/soc/spi at 78b5000/flash at 0/partitions/partition at 170000/label)
    0:ART
    root at OpenWrt:~# ls /sys/firmware/devicetree/base/soc/spi at 78b5000/flash at 0/partitions/partition at 170000/
    label  name   reg
    
    Revert to legacy method fixed the problem.
    
    Fixes: cfc13c44595d ("ipq40xx: utilize nvmem-cells for macs & (pre-)calibration data")
    Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com>
    (cherry picked from commit af425e42212d476dd95ec31f18d85b19004c9268)
---
 .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata   |  2 ++
 .../files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts      | 15 ---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 2c56e53f9c..c02b12dceb 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -76,6 +76,7 @@ case "$FIRMWARE" in
 		/usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \
 		/usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1")
 		;;
+	cellc,rtl30vw |\
 	openmesh,a42 |\
 	openmesh,a62 |\
 	plasmacloud,pa1200 |\
@@ -155,6 +156,7 @@ case "$FIRMWARE" in
 		/usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \
 		/usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1")
 		;;
+	cellc,rtl30vw |\
 	openmesh,a42 |\
 	openmesh,a62 |\
 	plasmacloud,pa1200 |\
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
index dcbe95c526..0caa0255d0 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
@@ -267,17 +267,6 @@
 				label = "0:ART";
 				reg = <0x170000 0x10000>;
 				read-only;
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				precal_art_1000: precal at 1000 {
-					reg = <0x1000 0x2f20>;
-				};
-
-				precal_art_5000: precal at 5000 {
-					reg = <0x5000 0x2f20>;
-				};
 			};
 
 			partition at 180000 {
@@ -387,14 +376,10 @@
 
 &wifi0 {
 	status = "okay";
-	nvmem-cell-names = "pre-calibration";
-	nvmem-cells = <&precal_art_1000>;
 	qcom,ath10k-calibration-variant = "cellc,rtl30vw";
 };
 
 &wifi1 {
 	status = "okay";
-	nvmem-cell-names = "pre-calibration";
-	nvmem-cells = <&precal_art_5000>;
 	qcom,ath10k-calibration-variant = "cellc,rtl30vw";
 };