From: Sander Vanheule <sander@svanheule.net>
Date: Sun, 5 Jun 2022 10:03:15 +0000 (+0200)
Subject: ath79: TP-Link EAP225 v3: convert ath10k to nvmem-cells
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eca0d7301198febc64f4a3561d50dac99d931155;p=openwrt%2Fstaging%2Fsvanheule.git

ath79: TP-Link EAP225 v3: convert ath10k to nvmem-cells

Add the PCIe node for the ath10k radio to the devicetree, and refer to
the art partition for the calibration data using nvmem-cells.

Use mac-address-increment to ensure the MAC address is set correctly,
and remove the device from the caldata extraction and patching script.

Signed-off-by: Sander Vanheule <sander@svanheule.net>
---

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
index 3d4950eaf0..ed599815c0 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
@@ -28,3 +28,21 @@
 		};
 	};
 };
+
+&art {
+	calibration_ath10k: calibration@5000 {
+		reg = <0x5000 0x2f20>;
+	};
+};
+
+&pcie {
+	wifi@0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0 0 0 0 0>;
+
+		mac-address-increment = <1>;
+
+		nvmem-cells = <&macaddr_info_8>, <&calibration_ath10k>;
+		nvmem-cell-names = "mac-address", "calibration";
+	};
+};
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index b8dc2042ea..1c80966efe 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -250,7 +250,6 @@ case "$FIRMWARE" in
 		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
 			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
 		;;
-	tplink,eap225-v3|\
 	tplink,eap225-wall-v2)
 		caldata_extract "art" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) 1)