ath79: qca: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / qca9558_tplink_archer-c7-v2.dts

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
index 1b860dbf2d5ff7ecff9f9173883d379423e0870b..b2877676e87a8f5263f36ad4c2f27d60487b4471 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
@@ -34,6 +34,16 @@
                label = "u-boot";
                reg = <0x000000 0x020000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                               reg = <0x1fc00 0x6>;
+                       };
+               };
        };
 
        partition@20000 {
@@ -47,16 +57,18 @@
                reg = <0xff0000 0x010000>;
                read-only;
 
-               compatible = "nvmem-cells";
-               #address-cells = <1>;
-               #size-cells = <1>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               calibration_art_1000: calibration@1000 {
-                       reg = <0x1000 0x440>;
-               };
+                       calibration_art_1000: calibration@1000 {
+                               reg = <0x1000 0x440>;
+                       };
 
-               calibration_art_5000: calibration@5000 {
-                       reg = <0x5000 0x844>;
+                       calibration_art_5000: calibration@5000 {
+                               reg = <0x5000 0x844>;
+                       };
                };
        };
 };
@@ -89,13 +101,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};