[openwrt/openwrt] ath79: convert OpenMesh OM2P v1 WiFis to nvmem-cells

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/d4ec4f9d0b83fbb79bbcd14e1022069e0024e46b

commit d4ec4f9d0b83fbb79bbcd14e1022069e0024e46b
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Thu Dec 15 18:18:16 2022 +0100

    ath79: convert OpenMesh OM2P v1 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.
    
    Merge art into partition node.
    
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts | 35 ++++++++++++----------
 .../etc/hotplug.d/firmware/10-ath9k-eeprom         |  3 --
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
index 456724a750..a66d914015 100644
--- a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
+++ b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
@@ -122,10 +122,26 @@
 				reg = <0x8c0000 0x700000>;
 			};
 
-			art: partition at fc0000 {
+			partition at fc0000 {
 				label = "ART";
 				reg = <0xfc0000 0x040000>;
 				read-only;
+
+				compatible = "nvmem-cells";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_art_0: macaddr at 0 {
+					reg = <0x0 0x6>;
+				};
+
+				macaddr_art_6: macaddr at 6 {
+					reg = <0x6 0x6>;
+				};
+
+				calibration_art_1000: calibration at 1000 {
+					reg = <0x1000 0x440>;
+				};
 			};
 		};
 	};
@@ -149,22 +165,9 @@
 	wifi at 0,0 {
 		compatible = "pci168c,002a";
 		reg = <0x0000 0 0 0 0>;
-		qca,no-eeprom;
+		nvmem-cells = <&calibration_art_1000>;
+		nvmem-cell-names = "calibration";
 		#gpio-cells = <2>;
 		gpio-controller;
 	};
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_0: macaddr at 0 {
-		reg = <0x0 0x6>;
-	};
-
-	macaddr_art_6: macaddr at 6 {
-		reg = <0x6 0x6>;
-	};
-};
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 aa76d1bc9f..ebcac0b6b2 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
@@ -112,9 +112,6 @@ case "$FIRMWARE" in
 	tplink,tl-wr842n-v1)
 		caldata_extract "art" 0x1000 0x1000
 		;;
-	openmesh,om2p-v1)
-		caldata_extract "ART" 0x1000 0x440
-		;;
 	wd,mynet-n600|\
 	wd,mynet-n750)
 		caldata_extract "art" 0x5000 0x440