ath79: fix dtc warnings in eap1200h

|109.3-19: Warning (reg_format): macaddr@0:reg:property has invalid length (8 bytes)
|113.3-24: Warning (reg_format): calibration@1000:reg: property has invalid length (8 bytes)
|117.3-24: Warning (reg_format): calibration@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@gmail.com>

diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
index 13c03e717a994dfce0fe8f2092fabd21c7920a8e..beb3e5ee07576b5654fc0750dc894ae16c210da3 100644 (file)
--- 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@ff0000 {
+       partition@ff0000 {
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               compatible = "nvmem-cells";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
+
+               calibration_art_1000: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
+
+               calibration_art_5000: calibration@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@0 {
-               reg = <0x0 0x6>;
-       };
-
-       calibration_ath9k: calibration@1000 {
-               reg = <0x1000 0x440>;
-       };
-
-       calibration_ath10k: calibration@5000 {
-               reg = <0x5000 0x844>;
-       };
-};