[openwrt/openwrt] ath79: fix dtc warnings in eap1200h

[LEDE Commits]

chunkeey pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0f227720f99e340734521d8326c44d9ae1f40fef

commit 0f227720f99e340734521d8326c44d9ae1f40fef
Author: Christian Lamparter <chunkeey at gmail.com>
AuthorDate: Thu Dec 15 15:20:26 2022 +0100

    ath79: fix dtc warnings in eap1200h
    
    |109.3-19: Warning (reg_format): macaddr at 0:reg:property has invalid length (8 bytes)
    |113.3-24: Warning (reg_format): calibration at 1000:reg: property has invalid length (8 bytes)
    |117.3-24: Warning (reg_format): calibration at 5000:reg: property has invalid length (8 bytes)
    
    also integrate the art-nodes nodes back into the partition-subnode
    and change the calibration labels to match what everyone else is
    doing.
    
    Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
---
 .../linux/ath79/dts/qca9557_engenius_eap1200h.dts  | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
index 13c03e717a..beb3e5ee07 100644
--- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
@@ -57,10 +57,26 @@
 };
 
 &partitions {
-	art: partition at ff0000 {
+	partition at ff0000 {
 		label = "art";
 		reg = <0xff0000 0x010000>;
 		read-only;
+
+		compatible = "nvmem-cells";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		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 0x844>;
+		};
 	};
 };
 
@@ -89,7 +105,7 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_art_0>, <&calibration_ath9k>;
+	nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>;
 	nvmem-cell-names = "mac-address", "calibration";
 	mac-address-increment = <1>;
 };
@@ -97,23 +113,7 @@
 &ath10k {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_art_0>, <&calibration_ath10k>;
+	nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
 	nvmem-cell-names = "mac-address", "calibration";
 	mac-address-increment = <2>;
 };
-
-&art {
-	compatible = "nvmem-cells";
-
-	macaddr_art_0: macaddr at 0 {
-		reg = <0x0 0x6>;
-	};
-
-	calibration_ath9k: calibration at 1000 {
-		reg = <0x1000 0x440>;
-	};
-
-	calibration_ath10k: calibration at 5000 {
-		reg = <0x5000 0x844>;
-	};
-};