From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 18 Feb 2024 05:22:13 +0000 (-0800)
Subject: ath79: convert pcs,cap324 calibration to nvmem
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=79fc4dba6014cf653bf43099e6742028b222f6f5;p=openwrt%2Fstaging%2Fblocktrron.git

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>
---

diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
index f7f3ef06c9..e03d0593ba 100644
--- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
@@ -110,7 +110,7 @@
 				reg = <0x050000 0x0fa0000>;
 			};
 
-			art: partition@7f0000 {
+			partition@7f0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
@@ -125,6 +125,14 @@
 						reg = <0x0 0x6>;
 						#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 {
 		compatible = "168c,0030";
 		reg = <0x0000 0 0 0 0>;
-		nvmem-cells = <&macaddr_art_0 (-2)>;
-		nvmem-cell-names = "mac-address";
-		mtd-cal-data = <&art 0x5000>;
-		qca,no-eeprom;
+		nvmem-cells = <&macaddr_art_0 (-2)>, <&cal_art_5000>;
+		nvmem-cell-names = "mac-address", "calibration";
 		ieee80211-freq-limit = <2402000 2482000>;
 		#gpio-cells = <2>;
 		gpio-controller;
@@ -151,9 +157,8 @@
 	status = "okay";
 
 	ieee80211-freq-limit = <4900000 5990000>;
-	mtd-cal-data = <&art 0x1000>;
-	nvmem-cells = <&macaddr_art_0 (-1)>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_0 (-1)>, <&cal_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 };
 
 &mdio0 {
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 1caba6aa7c..b1e4cd0038 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -93,8 +93,7 @@ case "$FIRMWARE" in
 	avm,fritz300e)
 		caldata_extract_reverse "urloader" 0x1541 0x440
 		;;
-	buffalo,wzr-hp-g450h|\
-	pcs,cap324)
+	buffalo,wzr-hp-g450h)
 		caldata_extract "art" 0x1000 0x440
 		;;
 	dlink,dir-825-c1|\