[openwrt/openwrt] ath79: convert Araknis AN-300-AP-I-N WiFis to nvmem-cells

[LEDE Commits]

chunkeey pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/1b125aabf4c5deb54bc5ea7f1bc3f8516f5ff79c

commit 1b125aabf4c5deb54bc5ea7f1bc3f8516f5ff79c
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Thu Dec 15 09:20:22 2022 +0100

    ath79: convert Araknis AN-300-AP-I-N WiFis to nvmem-cells
    
    Pull the calibration data from the nvmem subsystem. This allows us to
    move userspace caldata extraction into the device-tree definition.
    
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 .../linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts  | 19 ++++++++++++-------
 .../base-files/etc/hotplug.d/firmware/10-ath9k-eeprom |  1 -
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
index a886b4c001..07dc8da506 100644
--- a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
+++ b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
@@ -87,11 +87,10 @@
 	ath9k: wifi at 0,0,0 {
 		compatible = "pci168c,0030";
 		reg = <0x0 0 0 0 0>;
-		nvmem-cells = <&macaddr_art_0>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+		nvmem-cell-names = "mac-address", "calibration";
 		mac-address-increment = <1>;
 		qca,disable-5ghz;
-		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
 	};
@@ -102,10 +101,8 @@
 
 	qca,disable-2ghz;
 
-	mtd-cal-data = <&art 0x1000>;
-
-	nvmem-cells = <&macaddr_art_0>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>;
+	nvmem-cell-names = "mac-address", "calibration";
 	mac-address-increment = <2>;
 };
 
@@ -117,4 +114,12 @@
 	macaddr_art_0: macaddr at 0 {
 		reg = <0x0 0x6>;
 	};
+
+	calibration_art_1000: calibration at 1000 {
+		reg = <0x1000 0x440>;
+	};
+
+	calibration_art_5000: calibration at 5000 {
+		reg = <0x5000 0x440>;
+	};
 };
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 d6d5b257ff..52f015ed5f 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
@@ -83,7 +83,6 @@ case "$FIRMWARE" in
 	;;
 "ath9k-eeprom-pci-0000:00:00.0.bin")
 	case $board in
-	araknis,an-300-ap-i-n|\
 	atheros,db120|\
 	engenius,eap600|\
 	engenius,ecb600|\