ath79: qca: convert to nvmem-layout

Allows replacing mac-address-increment with mac-base.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/target/linux/ath79/dts/qca9531_8dev_lima.dts b/target/linux/ath79/dts/qca9531_8dev_lima.dts
index 5a21251d6d3e63631ef2cdd6ddc9fbfb0f7348bb..19097d718360143670ca4a2326f009c718613818 100644 (file)
--- a/target/linux/ath79/dts/qca9531_8dev_lima.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_lima.dts
@@ -67,6 +67,20 @@
                                label = "art";
                                reg = <0x080000 0x040000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        partition@c0000 {
@@ -108,17 +122,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
index 7873f75528b92a403fb2d7ce0b0dde33d969374e..072a0fa27c2a5fc8ef9a73af510b129a9e7f2d0c 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
+++ b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
@@ -119,24 +119,26 @@
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
index 406985d576f58dc3e61765fe5acd38ea839b9a69..c2e8f0b16256683ee721fd4dfb901fd4c2947a5d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
@@ -87,16 +87,18 @@
                                reg = <0x070000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9531_asus_rp-ac51.dts b/target/linux/ath79/dts/qca9531_asus_rp-ac51.dts
index ec8b825ef2f5120dcf8a51013b5a148619b396cf..b2777f6cc6fb9c8decb90081f5772bebdb29181a 100644 (file)
--- a/target/linux/ath79/dts/qca9531_asus_rp-ac51.dts
+++ b/target/linux/ath79/dts/qca9531_asus_rp-ac51.dts
@@ -97,16 +97,18 @@
                                reg = <0x050000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
index 4a84e150ae6596c2893270d5e3b15707a50e395e..d0d2a07c2b46e7a7b862781964119d991850673c 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
@@ -94,6 +94,16 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -134,13 +144,3 @@
        nvmem-cell-names = "mac-address";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
index c187521351919c9a809028536779c67e540a7889..d078a9dcce5bec5d091e06b1207ca628f1e1382c 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
@@ -93,6 +93,20 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -143,17 +157,3 @@
                reg = <0 0 0 0 0>;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_1002: macaddr@1002 {
-               reg = <0x1002 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
index 9288126788536834fdc6f0a4f13f05f27d7e5af9..ff053d628e471ee42f208df17f77c87813935e79 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
@@ -108,6 +108,20 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -149,17 +163,3 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index 17cbe1df142b4b39e25ca62f63e184abdaa9643a..73d45f9b7cc0bf4524350643f9f53abb597fd507 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -92,6 +92,20 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -134,17 +148,3 @@
                pinctrl-single,bits = <0x4 0x0 0xff>;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 75e30ff1b7bb03c60175c2e35095a7f48505b922..5a441b551dc6afa246ae995b536e6bfb954f8a5a 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -103,6 +103,16 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -161,13 +171,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <10>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index e5024b39f94fdaeff851e38bb1d045c56c72bf54..54cc9b2fa0584468edfc1799a9029a8d27a28745 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -87,6 +87,16 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -127,13 +137,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <3>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
index fc2f6de111410e27c65ef3a4c945ca5064354c7f..94adf258cb99e7edea9e3351a984508ac0b6c5a9 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
@@ -87,6 +87,16 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -126,13 +136,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <10>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
index 16a2794b9732b2e6edd022e3588e542b758ba197..7a8f6edcee1cf3d71c5937aa36b12cb1b7ee9719 100644 (file)
--- a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
+++ b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
@@ -83,6 +83,20 @@
                                label = "u-boot";
                                reg = <0x000000 0x030000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_2e010: macaddr@2e010 {
+                                               reg = <0x2e010 0x6>;
+                                       };
+
+                                       macaddr_uboot_2e018: macaddr@2e018 {
+                                               reg = <0x2e018 0x6>;
+                                       };
+                               };
                        };
 
                        partition@30000 {
@@ -136,17 +150,3 @@
 &usb0 {
        status = "okay";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_2e010: macaddr@2e010 {
-               reg = <0x2e010 0x6>;
-       };
-
-       macaddr_uboot_2e018: macaddr@2e018 {
-               reg = <0x2e018 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index 667f779b171ff90a6d8a70d27c894c4e9bc5984e..b7b663c8c2b5bb54fca99db8fc81afac42fc075a 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -114,6 +114,16 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -169,16 +179,6 @@
        mtd-cal-data = <&art 0x1000>;
 };
 
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
-
 &pinmux {
        pinctrl-names = "default";
        pinctrl-0 = <&enable_gpio17>;

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index 60bd2922a2d722470508567d659f497394233517..ed3ab2a2d0ac1e38b366ffdf4bddb8c4d1566902 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -113,6 +113,16 @@
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -144,13 +154,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
index ca0784e6bf60f6b32720043fa674d090386b8d38..e0c65b7f1b886f3c62d39d070353c42aca1ae8c4 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
@@ -83,6 +83,16 @@
                                label = "art";
                                reg = <0x50000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -133,13 +143,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
index 44bb83af64a9fd32195d590f8168f0621a62fed1..114ad46135191d2f27228a34c20b8ffcbd057603 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
@@ -136,8 +136,6 @@
                                reg = <0x050000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
index 5f5646b3e037e44333c64b7b86ccc79e0834b173..5810a63574729945d021fe7ea73e63681ccfb1c0 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x300b.dts
@@ -108,6 +108,16 @@
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -140,13 +150,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index 0b2030bb49cecf6e335ec1024505279d74694e2d..ae5373a37a6a3c5edb06963f48788c89bbe77db8 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -95,6 +95,16 @@
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -126,13 +136,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts b/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
index 9212c0a7548b58f64d1b6401bf44e584ad3ef56e..d0dfccd12c723f120be35a8b1a616b1571568176 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-xe300.dts
@@ -108,6 +108,16 @@
                                label = "art";
                                reg = <0x50000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -160,13 +170,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts b/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
index 2838b9c82d63c6d684eeee0083727f820cbcc75e..3b01fa9e421b51318869380ddb8dddf565ab541c 100644 (file)
--- a/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
+++ b/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
@@ -94,6 +94,20 @@
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -122,17 +136,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts b/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts
index 586facc9e5be34345082354028cc4039fd6b7bc7..414db556cade3773024b06811f1e4f664ae8cdff 100644 (file)
--- a/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts
+++ b/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts
@@ -119,20 +119,22 @@
                                reg = <0xff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               cal_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
index ce515159b1501b5356c20e20aec2b5e62f6fe554..d718f7501b5043a23acbf14e92e9ba11125aec61 100644 (file)
--- a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
+++ b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
@@ -79,6 +79,16 @@
                                label = "pri-data";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_pridata_400: macaddr@400 {
+                                               reg = <0x400 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@60000 {
@@ -110,13 +120,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&pridata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_pridata_400: macaddr@400 {
-               reg = <0x400 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_telco_t1.dts b/target/linux/ath79/dts/qca9531_telco_t1.dts
index 540de60377e2ff5227e0b3b08cf5b6194fbde925..1748d9e1c9cf0b3faf62fca80c7567aa9289e274 100644 (file)
--- a/target/linux/ath79/dts/qca9531_telco_t1.dts
+++ b/target/linux/ath79/dts/qca9531_telco_t1.dts
@@ -96,6 +96,20 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -138,17 +152,3 @@
                pinctrl-single,bits = <0x4 0x0 0xff>;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_teltonika_rut300.dts b/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
index f79be8dca54be42ea88842aaa7b17fdd0ed7e770..4954d35537fb086ea76f0021f0b9cc0f23c0aa14 100644 (file)
--- a/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
+++ b/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
@@ -84,6 +84,16 @@
                                label = "config";
                                reg = <0x020000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@30000 {
@@ -118,16 +128,6 @@
        status = "okay";
 };
 
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};
-
 &eth0 {
        status = "okay";
        phy-handle = <&swphy0>;

diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 0fc2bd3df82756b2974ba9f54a72a520ff5bbf99..887b8ef8161f856b598324006e3b191bc1831569 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -124,6 +124,16 @@
                                label = "romfile";
                                reg = <0x7d0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_romfile_f100: macaddr@f100 {
+                                               reg = <0xf100 0x6>;
+                                       };
+                               };
                        };
 
                        partition@7e0000 {
@@ -180,13 +190,3 @@
 &usb0 {
        status = "okay";
 };
-
-&romfile {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_romfile_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index e6fb85259612bf73d507ef5979c1bbc4895729b2..e8e1468ae194b8c1daf21cd99a83f5d91fb13ee4 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -149,6 +149,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 {
@@ -196,13 +206,3 @@
 &usb_phy {
        status = "okay";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
index 5a990fff0230095d6256f8eb03eb123b1bebfeb0..b1acb0b22bbbc407575819cc06fc656a330a8ae9 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
@@ -106,6 +106,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 {
@@ -154,13 +164,3 @@
 &usb_phy {
        status = "okay";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index 09f086b90ddda4c4ff4e60036e4b3188a2da46ed..9d408cddfa74e2841bba321d5e66d3992234d040 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -125,6 +125,16 @@
                                label = "info";
                                reg = <0x750000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@760000 {
@@ -180,13 +190,3 @@
 &usb0 {
        status = "okay";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_wallys_dr531.dts b/target/linux/ath79/dts/qca9531_wallys_dr531.dts
index 9982914442d3b7f36941847c4038c56a15a604a6..59f86170c98f193e4e48b494d2f057740ca5cbd1 100644 (file)
--- a/target/linux/ath79/dts/qca9531_wallys_dr531.dts
+++ b/target/linux/ath79/dts/qca9531_wallys_dr531.dts
@@ -116,6 +116,20 @@
                        env: partition@30000 {
                                label = "u-boot-env";
                                reg = <0x030000 0x010000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_env_f810: macaddr@f810 {
+                                               reg = <0xf810 0x6>;
+                                       };
+
+                                       macaddr_env_f818: macaddr@f818 {
+                                               reg = <0xf818 0x6>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
@@ -152,17 +166,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&env {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_env_f810: macaddr@f810 {
-               reg = <0xf810 0x6>;
-       };
-
-       macaddr_env_f818: macaddr@f818 {
-               reg = <0xf818 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
index a255342015af1571846b82fb15fa39950a60eac6..fa1f7dc5fca3c569cb7fb1206b79da4ce3ce50e9 100644 (file)
--- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts
+++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
@@ -88,6 +88,20 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -116,17 +130,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
index 64df0cff7c5f8654bcfc53cb3b9df00439136716..f4422e2242903dca56ea4cd2852f93b0d2299021 100644 (file)
--- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
+++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
@@ -112,6 +112,24 @@
                                label = "art";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -154,21 +172,3 @@
        nvmem-cells = <&macaddr_art_6>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_1002: macaddr@1002 {
-               reg = <0x1002 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_kuwfi_c910.dts b/target/linux/ath79/dts/qca9533_kuwfi_c910.dts
index a705aa8686bdc6f8c0f7748415d2a36b3ac00b56..b42915dd332d8af8f8399c423116a500a49fe78c 100644 (file)
--- a/target/linux/ath79/dts/qca9533_kuwfi_c910.dts
+++ b/target/linux/ath79/dts/qca9533_kuwfi_c910.dts
@@ -140,16 +140,18 @@
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               calibration_art_1000: macaddr@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       calibration_art_1000: macaddr@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
index 8a51d6b6d6597f2639f09551f790eb85aea8c900..f2a3a67b1e5cc1bcbe466be2386a51e61b622c67 100644 (file)
--- a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
+++ b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
@@ -122,6 +122,20 @@
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -154,17 +168,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
index 602365f45d8579c18c33fa4be2916f20aba8dbdf..dfd7e18d819f0ec73cdfa2a6da687ba68e914baf 100644 (file)
--- a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
+++ b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
@@ -104,6 +104,16 @@
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -137,13 +147,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_qca_ap143-16m.dts b/target/linux/ath79/dts/qca9533_qca_ap143-16m.dts
index 05d87e3995990a66142fba8734b227bd503aff2a..ce59e8a54b5c18ca76a225cc46c0e84de6ced582 100644 (file)
--- a/target/linux/ath79/dts/qca9533_qca_ap143-16m.dts
+++ b/target/linux/ath79/dts/qca9533_qca_ap143-16m.dts
@@ -45,6 +45,20 @@
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 };
 
@@ -61,17 +75,3 @@
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_qca_ap143-8m.dts b/target/linux/ath79/dts/qca9533_qca_ap143-8m.dts
index db6a92720ba3a30f441fb77e7778652d3661a916..f04885e47d1625af6986da726ef083268f1e4110 100644 (file)
--- a/target/linux/ath79/dts/qca9533_qca_ap143-8m.dts
+++ b/target/linux/ath79/dts/qca9533_qca_ap143-8m.dts
@@ -45,6 +45,20 @@
                label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+
+                       macaddr_art_6: macaddr@6 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 };
 
@@ -61,17 +75,3 @@
 &wmac {
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
index 3f3fae1dfd70f51dcad7dc2f379d952c22b5b690..e7044b60a4366fe63e493e269d88d9450382299d 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -80,6 +80,16 @@
                                label = "info";
                                reg = <0x030000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
@@ -119,13 +129,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
index 43db72ec650895868cba383d1e7d1c6007a3a5b3..5a05869a1c03671343bf662c2f2c346985926592 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
@@ -80,6 +80,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 {
@@ -117,13 +127,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
index e7d837a5740b89bceb965040dd7f8a2f13ebd4c0..762197f255af1119cba543dba17e8e42ff4a2d5a 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
@@ -128,6 +128,16 @@
                                label = "info";
                                reg = <0x3c0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@3d0000 {
@@ -165,13 +175,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index 4be1ced4b215521d77d6f9ac73ba734e70d5b973..520cc1b9e04585abbcc3fa8bffbade0ebac2d89a 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -51,6 +51,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 {
@@ -89,13 +99,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index c9c109ee392bfb00dd4b4373c7ae8a4d30982aeb..13d415e16d08bbe61c1ccd5f9487e65357581d5d 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -86,6 +86,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 {
@@ -125,13 +135,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
index 07b706251a349b207dd9a319e67bf460ccd5fa62..ba326ee61a612a066d3fa790a6734219efb7be94 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841hp-v3.dts
@@ -108,6 +108,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 {
@@ -147,13 +157,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
index 2d00159909b3007e8733362f671e8b8fd009bb51..1262e3fe12419ffe046bf8774df601944a282260 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -119,6 +119,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 {
@@ -158,13 +168,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
index e854f3700cd0a132df479718286a08af1760e9b4..c5d6e66c9a786fcf176c7fbbc17aac1ea93b4627 100644 (file)
--- a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
+++ b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
@@ -66,6 +66,20 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -93,17 +107,3 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9533_yuncore_a930.dts b/target/linux/ath79/dts/qca9533_yuncore_a930.dts
index 089eebaa9ccbc82a8a48542267cc04195540515a..30b340768f74878d956aeb95039aba820ee9e704 100644 (file)
--- a/target/linux/ath79/dts/qca9533_yuncore_a930.dts
+++ b/target/linux/ath79/dts/qca9533_yuncore_a930.dts
@@ -79,6 +79,20 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -102,17 +116,3 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi
index 13d41f7bd57d567374b4d94c990b6e8bfa49d302..ff08f90106c821fc122393fdeae197b9f96106bc 100644 (file)
--- a/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi
+++ b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi
@@ -47,12 +47,14 @@
                                reg = <0xff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               cal_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
+                                       cal_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index e49b8fc1ca051b1430f636f5d0ce29ec1107273d..b9045a3e5f4f261d3690ffd480b82a08a1109f9b 100644 (file)
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -68,6 +68,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 {
@@ -107,13 +117,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
index 8dbf1c8bc465d8986aa0cb331feea7f608525da3..d4bf64ab40bba8c29e6e874aea063e63dbaaa61b 100644 (file)
--- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts
+++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
@@ -156,6 +156,20 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -191,17 +205,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
index a81687469285ec51f3599411d77dcb9a807579f3..f01ac7fc91c1327e11cdb1cce090d3e6b5e3a780 100644 (file)
--- a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
+++ b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
@@ -45,6 +45,20 @@
                        label = "art";
                        reg = <0x500000 0x100000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_art_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
+
+                               macaddr_art_6: macaddr@6 {
+                                       reg = <0x6 0x6>;
+                               };
+                       };
                };
 
                partition@600000 {
@@ -119,17 +133,3 @@
 &usb1 {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts b/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
index bd9f3e8da8a0025b4103aa384b2d571de822e125..69f351ac5063d306a4e26188afa0b6c17747b5b7 100644 (file)
--- a/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
+++ b/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts
@@ -59,6 +59,16 @@
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+               };
        };
 };
 
@@ -97,13 +107,3 @@
 &pcie0 {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
index a4e2a615f6404a7a48954b0a940ea690b99e13f2..f17af66cdf9df6460e19e2afd450a79a1baf60aa 100644 (file)
--- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
+++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
@@ -95,6 +95,20 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -136,17 +150,3 @@
                full-duplex;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts b/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts
index 93e2fc0d974dad256599bbb3a1cd9a5d866247d1..b380fef5152ce48ab28e0f5c2b88865e154a70ac 100644 (file)
--- a/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts
+++ b/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts
@@ -90,7 +90,17 @@
 };
 
 &art {
-       cal_ath10k: calibration@5000 {
-               reg = <0x5000 0x844>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cal_ath9k: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
+
+               cal_ath10k: calibration@5000 {
+                       reg = <0x5000 0x844>;
+               };
        };
 };

diff --git a/target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi b/target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi
index 498499c14660651caed2b1dfac0f3a4144c5c5a1..c00b8184b4ff89f6aa7b4dbb22e8f2717cb423a4 100644 (file)
--- a/target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi
+++ b/target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi
@@ -102,20 +102,22 @@
                                reg = <0x1f0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               cal_art_5000: cal@5000 {
-                                       reg = <0x5000 0x844>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       cal_art_5000: cal@5000 {
+                                               reg = <0x5000 0x844>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
index d20a0444753a13c149d3956d4b3cbf5cd88536af..47f66f122237b4c1c17b465d134c7bff299fac91 100644 (file)
--- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
@@ -62,20 +62,22 @@
                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>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #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>;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
index 12740b9bdf7d3594e2fcdaad6725233b4d766fce..0c64f9952290f40fdd7ca3b144c485bebc9988f7 100644 (file)
--- a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
@@ -65,6 +65,16 @@
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+               };
        };
 };
 
@@ -114,13 +124,3 @@
 &pcie0 {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
index c8b1d94c96572fbd31d692e4362f366cc7b2feb1..34e0e44e47b396dcb5bbbc90b77078002ff34ca4 100644 (file)
--- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
+++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
@@ -83,6 +83,16 @@
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+               };
        };
 };
 
@@ -98,13 +108,3 @@
 &pcie0 {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts b/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
index 520ca60144b265cca61a26b28ef187b028b20339..c51fbc56535c4ec09a589ecae65ada58c7efce6a 100644 (file)
--- a/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
+++ b/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts
@@ -98,11 +98,13 @@
 };
 
 &art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
+               macaddr_art_0: macaddr@0 {
+                       reg = <0x0 0x6>;
+               };
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
index b8aed4c283a6112e2043be296241332b0b486ac4..37d0f0b268517149f77ae5cf807f71d8d83ca141 100644 (file)
--- a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
+++ b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
@@ -164,6 +164,16 @@
                                label = "oemdata";
                                reg = <0xfe0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_oemdata_1d: macaddr@1d {
+                                               reg = <0x1d 0x6>;
+                                       };
+                               };
                        };
 
                        partition@ff0000 {
@@ -219,16 +229,6 @@
        };
 };
 
-&oemdata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_oemdata_1d: macaddr@1d {
-               reg = <0x1d 0x6>;
-       };
-};
-
 &usb_phy0 {
        status = "okay";
 };

diff --git a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
index 72e52129a4cf08bf200fc193439276fc181de7bb..f534d51aa1fd7e59088ef020a9d16c06c0e892a1 100644 (file)
--- a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
+++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
@@ -151,6 +151,16 @@
                        art: partition@ff0000 {
                                label = "art";
                                reg = <0xff0000 0x010000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -217,13 +227,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
index b38e2e848f670a841fa6dd7de54e66917c79ad5c..208840ebba2f04fd8ba5551e3cc57d465eddc1e2 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
@@ -91,6 +91,16 @@
                                label = "art";
                                reg = <0x040000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -138,13 +148,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <10>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
index ba145d6fb0fe1e19a1b5764e244cc915b1132c92..e0471c534870a79ce4b4ca8c5f3811c231b84609 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
@@ -30,6 +30,24 @@
                                label = "art";
                                reg = <0x020000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_18: macaddr@18 {
+                                               reg = <0x18 0x6>;
+                                       };
+                               };
                        };
 
                        partition@30000 {
@@ -63,21 +81,3 @@
        nvmem-cells = <&macaddr_art_18>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_18: macaddr@18 {
-               reg = <0x18 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
index d0929f981c0120cc14dd2054a0f1a37c07f3ad14..9bbbf2a9b40db30578f353fcf8989db764d4095d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
@@ -30,6 +30,24 @@
                                label = "art";
                                reg = <0x040000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_18: macaddr@18 {
+                                               reg = <0x18 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -63,21 +81,3 @@
        nvmem-cells = <&macaddr_art_18>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_18: macaddr@18 {
-               reg = <0x18 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts b/target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts
index 61597c890956d9b6fb08f30fa49f2355bcb52634..d6ecc7728fad7ae49daa01d80b209a8f2171b620 100644 (file)
--- a/target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts
+++ b/target/linux/ath79/dts/qca9558_compex_wpj558-16m.dts
@@ -76,6 +76,16 @@
                                label = "u-boot";
                                reg = <0x000000 0x030000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_2e010: macaddr@2e010 {
+                                               reg = <0x2e010 0x6>;
+                                       };
+                               };
                        };
 
                        firmware@30000 {
@@ -131,13 +141,3 @@
 &pcie0 {
        status = "okay";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_2e010: macaddr@2e010 {
-               reg = <0x2e010 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index b96b314fa54e23c51bb65436da83eed697a2e896..f4a2cf040d2348c198ddc52239b11b13255ff93a 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -69,6 +69,16 @@
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -118,13 +128,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <(-2)>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
index c398dd637f1173cf78d41efea17046b141545dbe..d32329b3660dcee3df2bf275e1fb70fe3937fb83 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
@@ -90,7 +90,17 @@
 };
 
 &art {
-       precal_ath10k: pre-calibration@5000 {
-               reg = <0x5000 0x2f20>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cal_ath9k: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
+
+               precal_ath10k: pre-calibration@5000 {
+                       reg = <0x5000 0x2f20>;
+               };
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
index 1985fa48d837cc69a3bdc234f2f7aa9da23a01e7..3ca641a550700c3b92366353593a33304945fd2b 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
@@ -116,7 +116,17 @@
 };
 
 &art {
-       cal_ath10k: calibration@5000 {
-               reg = <0x5000 0x844>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cal_ath9k: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
+
+               cal_ath10k: calibration@5000 {
+                       reg = <0x5000 0x844>;
+               };
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts
index 27883f721cf55fdb98269f0f762d0a0da32a068e..e72af99da24341d308a4b7719db244d42f6bcc37 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts
@@ -104,7 +104,17 @@
 };
 
 &art {
-       cal_ath10k: calibration@5000 {
-               reg = <0x5000 0x844>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cal_ath9k: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
+
+               cal_ath10k: calibration@5000 {
+                       reg = <0x5000 0x844>;
+               };
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
index d012ae4c5056e6b1d4702b775f584d6a5ea823bf..e5c2cbcb72c75a3ab0a1e66ac8687bd6a168b322 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
@@ -114,8 +114,6 @@
                                reg = <0x048000 0x008000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -152,12 +150,14 @@
                                reg = <0x080000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               cal_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
index 976ac551f72ff0b9fa2bcaa7427e2afb0d69ea99..73f4ed0d1e1dd0c36ad6822c538cebb590bc67c5 100644 (file)
--- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
+++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
@@ -120,6 +120,24 @@
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -193,21 +211,3 @@
        nvmem-cells = <&macaddr_art_c>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts b/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts
index e17eda3840b1eb414cdd93b6fd0d0082ab5df2fc..47e4fec1424dfc9ce86d13c2d4992f7c9b8f8b17 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts
@@ -62,20 +62,22 @@
                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>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #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>;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts b/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts
index eca3a6091f71fb38aebbde638288377474e00e35..208eb11cd55270b7382ed3ec475ddf6fa519ec4b 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts
@@ -50,20 +50,22 @@
                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>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #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>;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts b/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts
index 159013066f62963c24df6c6e76dd64781ace4d36..6cd93f6b33d9d1c9bfd4b5a84eab692213ce2f26 100644 (file)
--- a/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts
+++ b/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts
@@ -84,20 +84,22 @@
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_lan: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_wan: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               calibration_art_wlan: calibration@1000 {
-                                       reg = <0x1000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_lan: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_wan: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       calibration_art_wlan: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index b3447f8be368b144ba56da4c4de9b2ff421bef31..5ee38b2e884c788d897a36881994982beafff0b7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -139,6 +139,24 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -193,21 +211,3 @@
        nvmem-cells = <&macaddr_art_c>;
        nvmem-cell-names = "mac-address";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_linksys_ea4500-v3.dts b/target/linux/ath79/dts/qca9558_linksys_ea4500-v3.dts
index 000dbce8e11a8e44ea80f20f9fb3a79a5793baeb..6c799efe33a54eacb3940c20a853147ae06b6e74 100644 (file)
--- a/target/linux/ath79/dts/qca9558_linksys_ea4500-v3.dts
+++ b/target/linux/ath79/dts/qca9558_linksys_ea4500-v3.dts
@@ -90,20 +90,22 @@
                        reg = <0x140000 0x40000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       cal_macaddr: macaddr@0 {
-                               reg = <0x6 0x6>;
-                       };
-
-                       cal_ath9k_soc: cal_ath9k@1000 {
-                               reg = <0x1000 0x440>;
-                       };
-
-                       cal_ath9k_pci: cal_ath9k@5000 {
-                               reg = <0x5000 0x440>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               cal_macaddr: macaddr@0 {
+                                       reg = <0x6 0x6>;
+                               };
+
+                               cal_ath9k_soc: cal_ath9k@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_ath9k_pci: cal_ath9k@5000 {
+                                       reg = <0x5000 0x440>;
+                               };
                        };
                };
 

diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dts b/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
index b94ccd30b7d9e74007b925ff071846747aa01069..81898e972f095fa150e66b514030bf734fa1d2f9 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
@@ -159,6 +159,32 @@
                                label = "caldata";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_caldata_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_caldata_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_caldata_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
+
+                                       cal_caldata_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       precal_caldata_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -218,29 +244,3 @@
 
        pll-data = <0x86000000 0x80000101 0x80001313>;
 };
-
-&caldata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_caldata_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_caldata_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_caldata_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_caldata_1000: cal@1000 {
-               reg = <0x1000 0x440>;
-       };
-
-       precal_caldata_5000: precal@5000 {
-               reg = <0x5000 0x2f20>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
index 85fd43699eec92c000fb4a44e191969e4faca03a..76305b2ecef2f564b585869e02ef0fe0cf760abf 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
@@ -106,6 +106,20 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -140,17 +154,3 @@
 
        pll-data = <0x8e000000 0x80000101 0x80001313>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
index be958d19a08cc2cf2143d61c2b402a40bcc5ec4c..d2125c38ba302e5d696e54c243034c508aef96bf 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
@@ -77,6 +77,24 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_art_12: macaddr@12 {
+                                               reg = <0x12 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -131,21 +149,3 @@
        pll-data = <0x3000101 0x101 0x1313>;
        qca955x-sgmii-fixup;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_art_12: macaddr@12 {
-               reg = <0x12 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
index c2062a800a114458ecb96ac98fdd86f26e671f86..12b60d0822936302d404005c11be83a2d81f14cd 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
@@ -111,6 +111,20 @@
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -179,17 +193,3 @@
 &pcie0 {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
index 8e11760daf4b004926597bc16011fca633fb568b..28e01ddd56545815379c11811c7c112011073d40 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
@@ -119,6 +119,16 @@
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -163,13 +173,3 @@
 &pcie0 {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
index 147b98f92536e2704ac922109f56ef853a588689..2744b01c8e3f3908f48dc994e1e9c970898503ff 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
@@ -130,6 +130,20 @@
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -198,17 +212,3 @@
 &pcie1 {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index 1ce924b8a0b09afbde84f44665daa87b05134179..9193d0e511d2c1c5ddc29d41736dcfe82de9aaf9 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
@@ -160,6 +160,20 @@
                                label = "ART";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -228,17 +242,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
index 5b28af5ca6efc8a1ef08d896601ad3baf357b8bd..9bed24ad09379afd8a2b199686bf54152ac5d0dc 100644 (file)
--- a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
+++ b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
@@ -89,6 +89,16 @@
                                label = "pri-data";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_pridata_400: macaddr@400 {
+                                               reg = <0x400 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@60000 {
@@ -167,13 +177,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&pridata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_pridata_400: macaddr@400 {
-               reg = <0x400 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
index 3d38ca79fe4e3d4b8ff1a83fa67badfa651d3ef8..8abd3e60b77600f246097e2d572bb39db821e754 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
+++ b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
@@ -107,6 +107,16 @@
                                label = "config";
                                reg = <0x060000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_201a: macaddr@201a {
+                                               reg = <0x201a 0x6>;
+                                       };
+                               };
                        };
 
                        partition@70000 {
@@ -157,16 +167,6 @@
        mtd-cal-data = <&art 0x1000>;
 };
 
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_201a: macaddr@201a {
-               reg = <0x201a 0x6>;
-       };
-};
-
 &usb0 {
        vbus-supply = <&reg_usb_vbus>;
 };

diff --git a/target/linux/ath79/dts/qca9558_sophos_ap15.dts b/target/linux/ath79/dts/qca9558_sophos_ap15.dts
index bb4b058a9a5a3ed388b0f4ead8301e4a39d74eba..490d3ae22767584456b2bf4ae4d1c5d8298b5037 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sophos_ap15.dts
+++ b/target/linux/ath79/dts/qca9558_sophos_ap15.dts
@@ -75,6 +75,16 @@
                                label = "config";
                                reg = <0x060000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_201a: macaddr@201a {
+                                               reg = <0x201a 0x6>;
+                                       };
+                               };
                        };
 
                        partition@70000 {
@@ -126,13 +136,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_201a: macaddr@201a {
-               reg = <0x201a 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
index 85012d3aace036a53d725c83925bbbe937a54ca3..a017d2f05901470bebc3d361ad4aabe17cfd9a6c 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
@@ -33,6 +33,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 {
@@ -65,13 +75,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
index e520a83d405a71a568b035866e2b5b1f114d8efb..2f5ffe15786032dcb7b9ec29f0b3943f1396730b 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
@@ -33,6 +33,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 {
@@ -46,12 +56,14 @@
                reg = <0x7f0000 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>;
+                       };
                };
        };
 };
@@ -71,13 +83,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>;
-       };
-};

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>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
index 4f822fbc7d145478b249bcb8a2545622ac717912..c40cb1265840e94d35361a11ab413c1d4ce73659 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
@@ -52,6 +52,16 @@
                                label = "romfs";
                                reg = <0xfd0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_romfs_f100: macaddr@f100 {
+                                               reg = <0xf100 0x6>;
+                                       };
+                               };
                        };
 
                        partition@fe0000 {
@@ -85,13 +95,3 @@
        nvmem-cells = <&macaddr_romfs_f100>;
        nvmem-cell-names = "mac-address";
 };
-
-&romfs {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_romfs_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
index 9adaa7fa6d30372993025c2fd2d6f3b1e6b88ea0..950e1d7b757d6ca35e2e464092b4e2b8a16fee7a 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
@@ -46,6 +46,16 @@
                                label = "romfs";
                                reg = <0xfd0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_romfs_f100: macaddr@f100 {
+                                               reg = <0xf100 0x6>;
+                                       };
+                               };
                        };
 
                        partition@fe0000 {
@@ -79,13 +89,3 @@
        nvmem-cells = <&macaddr_romfs_f100>;
        nvmem-cell-names = "mac-address";
 };
-
-&romfs {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_romfs_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index 0966f019089ba738836c3f91b86e0215f6a11f93..7c48326d576fb9887db26f1378be356f368d1181 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -152,6 +152,16 @@
                                label = "info";
                                reg = <0xda0000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@dc0000 {
@@ -176,13 +186,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index 31089f339daa4d3ce1096aa78bad53eff723e6a9..30e80177a907afd56014bc9da394e83726a5f3ef 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -135,6 +135,16 @@
                                label = "info";
                                reg = <0x610000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@630000 {
@@ -170,13 +180,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
index c6b9b077da29cf85966a4bd0c29af9f8c040f29a..b052a830bc751b7d755da74834de465ef7ae1ceb 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
@@ -138,12 +138,14 @@
                                reg = <0x000000 0x020000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_uboot_1fc00: macaddr@1fc00 {
-                                       reg = <0x1fc00 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
                                };
                        };
 
@@ -158,16 +160,18 @@
                                reg = <0x7f0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               cal_ath9k_soc: cal_ath9k@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       cal_ath9k_soc: cal_ath9k@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               cal_ath9k_pci: cal_ath9k@5000 {
-                                       reg = <0x5000 0x440>;
+                                       cal_ath9k_pci: cal_ath9k@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
index 998ede85cb9f71c6f772a168a1cce769d51de3f7..ccfebcc7ff85e07b7e855a2b083c9f2608d81144 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr7500-v3.dts
@@ -33,6 +33,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 {
@@ -65,13 +75,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 52996bba34767de00457e99d8c3d6000e6933700..158d1200dec331c5e98febfda73734aa9c31eabd 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -97,6 +97,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 {
@@ -164,13 +174,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
index 27bf82d20df1965027d1761c9828ef4c3d24111e..9d329000c9bd99fbbeed408e7ef7ba187fdde84d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
@@ -74,6 +74,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 {
@@ -117,13 +127,3 @@
        nvmem-cells = <&macaddr_uboot_1fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc00: macaddr@1fc00 {
-               reg = <0x1fc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts b/target/linux/ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts
index 91675ff615322d6f14e73a2b97b4da4794f85afb..09e7e1bf8d9d35d36b6c0802f8437f950009690f 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts
+++ b/target/linux/ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts
@@ -98,13 +98,3 @@
        phy-mode = "sgmii";
        phy-handle = <&phy4>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-500.dts b/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-500.dts
index 3827a94b248b8e076b017df498262492fed4724d..48f06e3dcb8559871aa33b58f1452e06b8fb01c8 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-500.dts
+++ b/target/linux/ath79/dts/qca9558_ubnt_powerbeam-5ac-500.dts
@@ -36,13 +36,3 @@
        phy-mode = "sgmii";
        phy-handle = <&phy4>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_ubnt_rocket-5ac-lite.dts b/target/linux/ath79/dts/qca9558_ubnt_rocket-5ac-lite.dts
index 836211ccd58814a2eed3bf43dfbed963cefae8f2..7df3759b628e9ec2eee35a6776769dc48cdd5285 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ubnt_rocket-5ac-lite.dts
+++ b/target/linux/ath79/dts/qca9558_ubnt_rocket-5ac-lite.dts
@@ -36,13 +36,3 @@
        phy-mode = "sgmii";
        phy-handle = <&phy4>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9558_watchguard_ap300.dts b/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
index 799883c350f2bfd765e8580de353b3572c107687..6ad6add64afd58b11cac1a92edaac8099e6e66e5 100644 (file)
--- a/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
+++ b/target/linux/ath79/dts/qca9558_watchguard_ap300.dts
@@ -104,6 +104,16 @@
                label = "art";
                reg = <0x1ff0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_art_0: macaddr@0 {
+                               reg = <0x0 0x6>;
+                       };
+               };
        };
 };
 
@@ -124,13 +134,3 @@
 &pcie0 {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi
index 3e254fa494eaaf3791fe0c40077f22bc1294618d..1e082ffd7f6f2db4c3f0502b5dc7256b7f4377a5 100644 (file)
--- a/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi
+++ b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi
@@ -46,14 +46,6 @@
                                label = "art";
                                reg = <0xff0000 0x10000>;
                                read-only;
-
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               cal_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
                        };
                };
        };

diff --git a/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi b/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
index e1b76bcbd1f81b9851c0b68fa265e26cca4398b7..61446263c479837600ddd6e431d59e74d322d064 100644 (file)
--- a/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
+++ b/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
@@ -103,14 +103,18 @@
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-
-                               calibration_art_1000: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_art_5000: calibration@5000 {
-                                       reg = <0x5000 0x844>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       calibration_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x844>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi b/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi
index 0f803945db632873a6d7e97cb0a482106354e8c2..519f831beabfe904d21ca1c54af340458a356f90 100644 (file)
--- a/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi
+++ b/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi
@@ -50,6 +50,16 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index 4b371e0e8e8893a9f22964b7afc5203386b6d9c2..0a01ed6dbc1ea9a5e0b89335f82fb005fc9618e1 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -152,6 +152,16 @@
                                label = "info";
                                reg = <0x7e0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@7f0000 {
@@ -191,13 +201,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
index 180efada1270b683b18a8a6d7ec473dfdde9d723..5c1f0334ffa97ae78956033183ea9d424a82d9a9 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
@@ -34,6 +34,16 @@
                                label = "info";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -74,13 +84,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
index f05a290d2f8945f33af817e7f58a714c3d0ad6d6..1963428cd0ff9eeb4ee2c2488ebaf71feab471c0 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
@@ -51,6 +51,16 @@
                                label = "info";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -91,13 +101,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
index 4be23ffbc02f7b6f4c434a51fe773961111c2935..9f66b1c64213ea92450d69732364d64407fa701c 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
@@ -57,6 +57,16 @@
                                label = "info";
                                reg = <0x030000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
@@ -97,13 +107,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
index f5ab2e5977c9f2b6003251dfe37caea0cf326d1c..8602449d94ab35dfbd400262a9b6bbccc051ea58 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
@@ -46,6 +46,16 @@
                                label = "info";
                                reg = <0x010000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -86,13 +96,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
index 014222770f9aa9a5f8e1a7f3e27cfcb9b5f9f3d9..fe217f206e0f0546c6ba7b02f721b1b2e7b89fc1 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
@@ -46,6 +46,16 @@
                                label = "info";
                                reg = <0x01fb00 0x000500>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -92,13 +102,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
index a2f46ecd6045f1caef617344822f84a48182994b..505bfefed14c937b508d5aa3ddcec2a1d6c72eb4 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
@@ -41,6 +41,16 @@
                                label = "info";
                                reg = <0x01fb00 0x000500>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -87,13 +97,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
index 439549d14254d35b8a904a1fc29b4397ca12749e..856161a987327ccc9d5ec558f3f8ef974dcab675 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
@@ -99,6 +99,16 @@
                                label = "info";
                                reg = <0x030000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@40000 {
@@ -132,16 +142,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_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       calibration_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               precalibration_ath10k: pre-calibration@5000 {
-                                       reg = <0x5000 0x2f20>;
+                                       precalibration_ath10k: pre-calibration@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
                };
@@ -161,13 +173,3 @@
        nvmem-cells = <&macaddr_info_8>, <&calibration_ath9k>;
        nvmem-cell-names = "mac-address", "calibration";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts b/target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts
index 15c586865975f9022d0fb1b4f4eb43f24c66b570..f4ba15a599df832fb21b29cc8a475b5f85d8e88e 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts
@@ -81,12 +81,14 @@
                                reg = <0x000000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_uboot_0fc00: macaddr@0fc00 {
-                                       reg = <0x0fc00 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_0fc00: macaddr@0fc00 {
+                                               reg = <0x0fc00 0x6>;
+                                       };
                                };
                        };
 
@@ -101,16 +103,18 @@
                                reg = <0x7f0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               calibration_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       calibration_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               calibration_ath10k: calibration@5000 {
-                                       reg = <0x5000 0x844>;
+                                       calibration_ath10k: calibration@5000 {
+                                               reg = <0x5000 0x844>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
index 6e45fbb20fc8dd2f49de7ca745413135fe1b7ab2..b0f5c8de43b448eacbef763bd32c51a272c5a62e 100644 (file)
--- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
+++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
@@ -93,6 +93,20 @@
                                label = "art";
                                reg = <0x60000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        partition@70000 {
@@ -139,17 +153,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <1>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_asus_pl-ac56.dts b/target/linux/ath79/dts/qca9563_asus_pl-ac56.dts
index c597b566aa0cf053ff57e495db1d688757476e39..a31f188142ffad16e3d083850cc59634ae4aae1f 100644 (file)
--- a/target/linux/ath79/dts/qca9563_asus_pl-ac56.dts
+++ b/target/linux/ath79/dts/qca9563_asus_pl-ac56.dts
@@ -91,12 +91,14 @@
                                reg = <0x050000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9563_asus_rp-ac66.dts b/target/linux/ath79/dts/qca9563_asus_rp-ac66.dts
index ac3551d11569766a976c359e91aa0eb7480f8c78..c4b9f3471348156e5d023dcb1d155601a67df4a2 100644 (file)
--- a/target/linux/ath79/dts/qca9563_asus_rp-ac66.dts
+++ b/target/linux/ath79/dts/qca9563_asus_rp-ac66.dts
@@ -113,12 +113,14 @@
                                reg = <0x050000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
index 20c970095200eb3d07eb4bf045e08bc5d5af46b9..33a496f8b7ba8d7e9b359f258cfaed5619dd9a14 100644 (file)
--- a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
+++ b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
@@ -84,6 +84,16 @@
                                label = "art";
                                reg = <0x040000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -135,13 +145,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <10>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_compex_wpj563.dts b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
index 407e912ad2693d98400d60f2043c7dd84fa05f65..95ca9003983055fec85535375d03515c0b219ff4 100644 (file)
--- a/target/linux/ath79/dts/qca9563_compex_wpj563.dts
+++ b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
@@ -79,6 +79,16 @@
                                label = "u-boot";
                                reg = <0x000000 0x030000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_2e010: macaddr@2e010 {
+                                               reg = <0x2e010 0x6>;
+                                       };
+                               };
                        };
 
                        partition@30000 {
@@ -143,13 +153,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_2e010: macaddr@2e010 {
-               reg = <0x2e010 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-8x9-a1.dtsi b/target/linux/ath79/dts/qca9563_dlink_dir-8x9-a1.dtsi
index 616c29a4c1569fc4f4c98e581935af632351582f..70ec60219dfcc09c2b807b28263a70e9d52ce777 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-8x9-a1.dtsi
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-8x9-a1.dtsi
@@ -67,8 +67,6 @@
                                reg = <0x050000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
@@ -106,17 +104,19 @@
                                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_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       calibration_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               calibration_ath10k: calibration@5000 {
-                                       reg = <0x5000 0x844>;
-                               };      
+                                       calibration_ath10k: calibration@5000 {
+                                               reg = <0x5000 0x844>;
+                                       };
+                               };
                        };
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
index f7358891b04824be1be45c08e685bcf24bf0dda9..77d5fc360bc56f10280790d774b1391f7dc18461 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
@@ -45,20 +45,22 @@
                reg = <0xff0000 0x010000>;
                read-only;
 
-               compatible = "nvmem-cells";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               cal_art_1000: cal@1000 {
-                       reg = <0x1000 0x440>;
-               };
-
-               macaddr_art_1002: macaddr@1002 {
-                       reg = <0x1002 0x6>;
-               };
-
-               cal_art_5000: cal@5000 {
-                       reg = <0x5000 0x844>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cal_art_1000: cal@1000 {
+                               reg = <0x1000 0x440>;
+                       };
+
+                       macaddr_art_1002: macaddr@1002 {
+                               reg = <0x1002 0x6>;
+                       };
+
+                       cal_art_5000: cal@5000 {
+                               reg = <0x5000 0x844>;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
index 5ffff57b48231348bf7cf0918f463b369d09379f..7d977802ea914ffa17b0fbfa3a8d7f6afed9da7c 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
@@ -39,16 +39,18 @@
                reg = <0x7f0000 0x010000>;
                read-only;
 
-               compatible = "nvmem-cells";
-               #address-cells = <1>;
-               #size-cells = <1>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               cal_art_1000: cal@1000 {
-                       reg = <0x1000 0x440>;
-               };
+                       cal_art_1000: cal@1000 {
+                               reg = <0x1000 0x440>;
+                       };
 
-               macaddr_art_1002: macaddr@1002 {
-                       reg = <0x1002 0x6>;
+                       macaddr_art_1002: macaddr@1002 {
+                               reg = <0x1002 0x6>;
+                       };
                };
        };
 };

diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
index d3562398bcbf2756db92b5bdddb70845de0bdb39..09d2f48c2aa7ed8993afc8502ff326bef3689dcf 100644 (file)
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
@@ -95,6 +95,16 @@
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        /* Firmware / Kernel flash type specific */
@@ -174,13 +184,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
index 8980f772e7459c8efdc317f7f5994fa0343f5ed6..ab1f8902b10a0f4ddc14faf1393edc2dd63674bc 100644 (file)
--- a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
@@ -95,28 +95,30 @@
                                reg = <0x050000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               calibration_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               calibration_ath10k: calibration@5000 {
-                                       reg = <0x5000 0x2f20>;
-                               };
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
-                               };
-
-                               macaddr_art_5006: macaddr@5006 {
-                                       reg = <0x5006 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       calibration_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       calibration_ath10k: calibration@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
+
+                                       macaddr_art_5006: macaddr@5006 {
+                                               reg = <0x5006 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
index 799297f4e15ffc2ab90580cc256f6e35af3ca963..c4faec8ef140db5c76bff5f6a6884d3d64cde0ae 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
@@ -162,6 +162,28 @@
                                label = "caldata";
                                reg = <0x1f0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_caldata_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_caldata_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       cal_art_5000: cal@5000 {
+                                               reg = <0x5000 0x440>;
+                                       };
+                               };
                        };
                };
        };
@@ -261,25 +283,3 @@
 &usb0 {
        status = "okay";
 };
-
-&caldata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_caldata_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_caldata_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       cal_art_1000: cal@1000 {
-               reg = <0x1000 0x440>;
-       };
-
-       cal_art_5000: cal@5000 {
-               reg = <0x5000 0x440>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
index c6c610dbee2749a7171985895977be600449941f..a4f7be3e1cd6ffeb1256534357339360eff31105 100644 (file)
--- a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
+++ b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
@@ -82,6 +82,16 @@
                                label = "pri-data";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_pridata_400: macaddr@400 {
+                                               reg = <0x400 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@60000 {
@@ -141,13 +151,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&pridata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_pridata_400: macaddr@400 {
-               reg = <0x400 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
index c73d5a6e58305a3f08d4357b99c949bcd3d282bc..6e45a20aaed934e3d2bc2e4dfee394684c2a1a4a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
+++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
@@ -72,6 +72,16 @@
                                label = "factory";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -133,13 +143,3 @@
 &usb1 {
        status = "okay";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts b/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
index 3bb6d685cc5625df080b19c8454e8625f1f44e22..339891f6da07eab6cb59015b870b3d9d9dcc00be 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
@@ -43,6 +43,16 @@
                label = "info";
                reg = <0xf40000 0x020000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_info_8: macaddr@8 {
+                               reg = <0x8 0x6>;
+                       };
+               };
        };
 
        config: partition@f60000 {
@@ -75,13 +85,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
index 6d5a21c138f6b0efc010fafc8f189010e13293ce..9925666f826911d3224448af8a621473eedd75ab 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
@@ -127,6 +127,16 @@
                                label = "info";
                                reg = <0x7e0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@7f0000 {
@@ -173,13 +183,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
index e6fd689c999fd466b191247ffdac5c5fa3ad17a8..6857054f1cbbbdeeda9ec80533c38574d3dbd88d 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
@@ -99,6 +99,16 @@
                                label = "info";
                                reg = <0x020000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@30000 {
@@ -139,13 +149,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
index c40fe0f29238149801adc21e5c4ccae0a30b1953..e7d19c9fbd301fc2138568adbd572bad71e68954 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
@@ -99,6 +99,16 @@
                                label = "info";
                                reg = <0x020000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@30000 {
@@ -133,13 +143,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
index 3c6b8c4fb9468a601a1d677b4c9d6dae61fb13fc..ae6061c4cef4f7e3dc7fd95b9f9860217ba69589 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
@@ -198,6 +198,16 @@
                                label = "info";
                                reg = <0xf00000 0x0f0000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@ff0000 {
@@ -243,13 +253,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts
index d2631e227cbab77eca8241e24ac93d808f89d623..32b75cad7b4a97de2946a1c0d5e10d6b45af642c 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts
@@ -49,6 +49,16 @@
                label = "info";
                reg = <0x060000 0x020000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_info_8: macaddr@8 {
+                               reg = <0x8 0x6>;
+                       };
+               };
        };
 
        partition@80000 {
@@ -81,13 +91,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts b/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts
index 9421ea225aef2f7c393543f8b2b30b78a173f88d..491ffac1326a00bb17a15ca84007d4beda1fdadb 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts
@@ -81,6 +81,16 @@
                                label = "info";
                                reg = <0x060000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@70000 {
@@ -138,13 +148,3 @@
                device = <&gmac>;
        };
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts b/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts
index 8cd9004bd3fb378e4b9f986449e44e22318c6b84..63f42eba7600b8ef2383622b7c6fb29f88a20d20 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts
@@ -106,6 +106,16 @@
                                label = "config";
                                reg = <0xe85000 0x16b000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        art: partition@ff0000 {
@@ -134,13 +144,3 @@
        nvmem-cells = <&macaddr_config_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
index 79c45f1ea8a26fe81cd8bdcacb608357b02fa8e6..929cedad720db6157d532fd7e92321f94b7c4afd 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
@@ -30,8 +30,18 @@
 };
 
 &art {
-       precalibration_ath10k: pre-calibration@5000 {
-               reg = <0x5000 0x2f20>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_info_8: macaddr@8 {
+                       reg = <0x8 0x6>;
+               };
+
+               precalibration_ath10k: pre-calibration@5000 {
+                       reg = <0x5000 0x2f20>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
index e5914c9a55069e5baa5c7b989f3405c762e4d29d..da082d3b405e089c6973647c37a5af427a7a6c67 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
@@ -30,8 +30,18 @@
 };
 
 &art {
-       precalibration_ath10k: pre-calibration@5000 {
-               reg = <0x5000 0x2f20>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_info_8: macaddr@8 {
+                       reg = <0x8 0x6>;
+               };
+
+               precalibration_ath10k: pre-calibration@5000 {
+                       reg = <0x5000 0x2f20>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
index 8423daf60231008743b1e8483b8ea76ab0a4dbc7..e03fdf6f8880db4767c6bd7be74eb08a5fb8256b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
@@ -51,8 +51,18 @@
 };
 
 &art {
-       calibration_ath10k: calibration@5000 {
-               reg = <0x5000 0x844>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_info_8: macaddr@8 {
+                       reg = <0x8 0x6>;
+               };
+
+               calibration_ath10k: calibration@5000 {
+                       reg = <0x5000 0x844>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
index 290172b0cc3493d96f8e89a8c8035e4ebbdc6e75..6e34938379f8fbdd5a36cf0897ef6b4edb43645e 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
@@ -30,8 +30,18 @@
 };
 
 &art {
-       precalibration_ath10k: pre-calibration@5000 {
-               reg = <0x5000 0x2f20>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_info_8: macaddr@8 {
+                       reg = <0x8 0x6>;
+               };
+
+               precalibration_ath10k: pre-calibration@5000 {
+                       reg = <0x5000 0x2f20>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
index ae27ff70684699adc1c61509b73c851b1add9b44..3fbb3414c1afdb98c831976487cb05e020d3b1ad 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
@@ -30,8 +30,18 @@
 };
 
 &art {
-       precalibration_ath10k: pre-calibration@5000 {
-               reg = <0x5000 0x2f20>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_info_8: macaddr@8 {
+                       reg = <0x8 0x6>;
+               };
+
+               precalibration_ath10k: pre-calibration@5000 {
+                       reg = <0x5000 0x2f20>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
index 236c9e7457b7afc21c2adb1936391326b45fa7b8..b4c9e7e5d29f57a2a08847c0c9d544d3c4e101bf 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
@@ -44,8 +44,18 @@
 };
 
 &art {
-       calibration_ath10k: calibration@5000 {
-               reg = <0x5000 0x844>;
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               macaddr_info_8: macaddr@8 {
+                       reg = <0x8 0x6>;
+               };
+
+               calibration_ath10k: calibration@5000 {
+                       reg = <0x5000 0x844>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
index ab5bc7b1a94d34720a6311420a9c0dddb4f1ea17..fb504f1fcf87d5999470efe7a62829888896c219 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
@@ -93,6 +93,16 @@
                                label = "info";
                                reg = <0x090000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@a0000 {
@@ -100,16 +110,18 @@
                                reg = <0x0a0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               calibration_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       calibration_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               calibration_ath10k: calibration@5000 {
-                                       reg = <0x5000 0x2f20>;
+                                       calibration_ath10k: calibration@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
 
@@ -176,13 +188,3 @@
        nvmem-cells = <&macaddr_info_8>, <&calibration_ath9k>;
        nvmem-cell-names = "mac-address", "calibration";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
index f384031335b626269bd9310c4ee998e9e199938f..438e6bc2ec18c9c809d208f825696bf0a111b7b2 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
@@ -82,12 +82,14 @@
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               calibration_ath9k: calibration@1000 {
-                                       reg = <0x1000 0x440>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       calibration_ath9k: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
                                };
                        };
                };
@@ -129,13 +131,3 @@
        nvmem-cells = <&macaddr_info_8>, <&calibration_ath9k>;
        nvmem-cell-names = "mac-address", "calibration";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
index 73cf5323eea542c561ada9a7b1c6e8900d70272e..5eb1eafaf41c4a22352b1a92e300cda8a1360227 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
@@ -34,6 +34,16 @@
                label = "info";
                reg = <0x610000 0x020000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_info_8: macaddr@8 {
+                               reg = <0x8 0x6>;
+                       };
+               };
        };
 
        partition@630000 {
@@ -60,13 +70,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v3.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v3.dts
index ffebcb9baea6949dc2af76640664d596a7863634..fdd982ae2e2447263a0958e6b732412fc29a626a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_re450-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_re450-v3.dts
@@ -22,6 +22,16 @@
                label = "info";
                reg = <0x020000 0x002000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_info_8: macaddr@8 {
+                               reg = <0x8 0x6>;
+                       };
+               };
        };
 
        partition@22000 {
@@ -66,13 +76,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_re455-v1.dts b/target/linux/ath79/dts/qca9563_tplink_re455-v1.dts
index bf4e5848af8d78410916af72dee55d4bd60700d7..a976f4fa5a2bf643c253a8d5db8916131c5fc6cf 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_re455-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_re455-v1.dts
@@ -22,6 +22,16 @@
                label = "info";
                reg = <0x020000 0x002000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_info_8: macaddr@8 {
+                               reg = <0x8 0x6>;
+                       };
+               };
        };
 
        partition@22000 {
@@ -66,13 +76,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts
index 71ab4f8aad593a47f0ac524b52ba3668cafc8057..cf13fcd6b7ff5c75619e2af75b9cd32f2cd16d0d 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts
@@ -127,6 +127,16 @@
                                label = "info";
                                reg = <0x020000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@30000 {
@@ -149,13 +159,3 @@
                };
        };
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
index 0ccfb42d9acb846ee0f1183ee709453166f723c6..8c6c91f10702287c441b017586d9bbadfd515305 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
@@ -16,6 +16,16 @@
                label = "u-boot";
                reg = <0x000000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_uboot_fc00: macaddr@fc00 {
+                               reg = <0xfc00 0x6>;
+                       };
+               };
        };
 
        partition@10000 {
@@ -48,13 +58,3 @@
        nvmem-cells = <&macaddr_uboot_fc00>;
        nvmem-cell-names = "mac-address";
 };
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_fc00: macaddr@fc00 {
-               reg = <0xfc00 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts
index 95ff6b03631adcd8f31ae0f0c723c0db5c152e0a..8786e309659e0eb60bb1630e86fa89766b6c544d 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts
@@ -46,6 +46,16 @@
                label = "info";
                reg = <0x7e0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_info_8: macaddr@8 {
+                               reg = <0x8 0x6>;
+                       };
+               };
        };
 
        art: partition@7f0000 {
@@ -66,13 +76,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts
index 34efeb9450947d76cd6fe02cb3f11607b26fbca0..3c688d67d636a4cab7ea9c2c9c7c8e1f8624c843 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts
@@ -40,6 +40,16 @@
                label = "info";
                reg = <0x630000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_info_8: macaddr@8 {
+                               reg = <0x8 0x6>;
+                       };
+               };
        };
 
        partition@640000 {
@@ -66,13 +76,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts
index a477b50417dc40578871b9d080806625576ee1c9..786cd3cc039e005475dc6ca7f5b5fa768a01ce8b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts
@@ -42,6 +42,16 @@
                label = "info";
                reg = <0x7e0000 0x010000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       macaddr_info_8: macaddr@8 {
+                               reg = <0x8 0x6>;
+                       };
+               };
        };
 
        art: partition@7f0000 {
@@ -62,13 +72,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts
index 6d7582451597f1547ca59149986e5e38718bd27c..dac0da9fdc925b8cd9f709c51d031db84b537329 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts
@@ -46,6 +46,16 @@
                                label = "info";
                                reg = <0xf00000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@f20000 {
@@ -86,13 +96,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
index 80a63f6efc0c6a3547392c44a379d75412a46350..4aa0ef572f632b15386627a8249ab7272dfcf304 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
@@ -51,6 +51,16 @@
                                label = "info";
                                reg = <0xf50000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_info_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
+                               };
                        };
 
                        partition@f70000 {
@@ -108,13 +118,3 @@
        nvmem-cells = <&macaddr_info_8>;
        nvmem-cell-names = "mac-address";
 };
-
-&info {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_info_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index 6704ec983b0beed5421a59f663cf8db6d650f559..da01251f3bd6c4314f690e0cb8c7f35b972c07c1 100644 (file)
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
@@ -90,6 +90,16 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -100,13 +110,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts b/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
index b6206b046d2ef2641d5de97d6e9fe687dd4a44a5..2085644f766289064cba34a6ede4f8866a07fd4a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
+++ b/target/linux/ath79/dts/qca9563_xiaomi_aiot-ac2350.dts
@@ -109,6 +109,16 @@
                                label = "art";
                                reg = <0x60000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@70000 {
@@ -174,13 +184,3 @@
 &pcie {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
index 6f729a21fe8ba702c434784bcd1041daeb9939fa..dff9428295067b51d2972a7d532038c2f2cb75ae 100644 (file)
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
@@ -94,6 +94,16 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -104,13 +114,3 @@
 
        mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-};

diff --git a/target/linux/ath79/dts/qca9563_zte_mf281.dts b/target/linux/ath79/dts/qca9563_zte_mf281.dts
index 9205061e2432bf2205ef1e1803648bba4519487c..a4e54975db596801b8190c02e994fcb99581d394 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf281.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf281.dts
@@ -49,16 +49,18 @@
                        reg = <0xa0000 0x80000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       cal_caldata_1000: cal@1000 {
-                               reg = <0x1000 0x440>;
-                       };
-
-                       cal_caldata_5000: cal@5000 {
-                               reg = <0x5000 0x2f20>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               cal_caldata_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_caldata_5000: cal@5000 {
+                                       reg = <0x5000 0x2f20>;
+                               };
                        };
                };
 
@@ -67,12 +69,14 @@
                        reg = <0x120000 0x80000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       macaddr_mac_0: macaddr@0 {
-                               reg = <0x0 0x6>;
+                               macaddr_mac_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
                        };
                };
 

diff --git a/target/linux/ath79/dts/qca9563_zte_mf282.dts b/target/linux/ath79/dts/qca9563_zte_mf282.dts
index 1f3038dacedce80101fb490bde078ce6fa1ee385..2cb3c1a60b9a30f08b8b6ebfab6885b206fae518 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf282.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf282.dts
@@ -61,16 +61,18 @@
                        reg = <0x140000 0x140000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       cal_caldata_1000: cal@1000 {
-                               reg = <0x1000 0x440>;
-                       };
-
-                       cal_caldata_5000: cal@5000 {
-                               reg = <0x5000 0x844>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               cal_caldata_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_caldata_5000: cal@5000 {
+                                       reg = <0x5000 0x844>;
+                               };
                        };
                };
 
@@ -79,12 +81,14 @@
                        reg = <0x280000 0x140000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       macaddr_mac_0: macaddr@0 {
-                               reg = <0x0 0x6>;
+                               macaddr_mac_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
                        };
                };
 

diff --git a/target/linux/ath79/dts/qca9563_zte_mf286.dts b/target/linux/ath79/dts/qca9563_zte_mf286.dts
index 877075c7699780f2f40b69a8519eb379ac078f07..26e27ee0204be79f991aa04ea78d09716f6ba901 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf286.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf286.dts
@@ -62,16 +62,18 @@
                        reg = <0x140000 0x140000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       cal_caldata_1000: cal@1000 {
-                               reg = <0x1000 0x440>;
-                       };
-
-                       cal_caldata_5000: cal@5000 {
-                               reg = <0x5000 0x844>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               cal_caldata_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_caldata_5000: cal@5000 {
+                                       reg = <0x5000 0x844>;
+                               };
                        };
                };
 
@@ -80,12 +82,14 @@
                        reg = <0x280000 0x140000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       macaddr_mac_0: macaddr@0 {
-                               reg = <0x0 0x6>;
+                               macaddr_mac_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
                        };
                };
 

diff --git a/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi b/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
index 45ac3bc7ea5e164d8e32bb1c9f8cadee6627d137..dc08a21452c66bf3af1ceea5bc73e7c40d3ca043 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
+++ b/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
@@ -65,16 +65,18 @@
                        reg = <0xa0000 0x80000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       cal_art_1000: cal@1000 {
-                               reg = <0x1000 0x440>;
-                       };
-
-                       precal_art_5000: precal@5000 {
-                               reg = <0x5000 0x2f20>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               cal_art_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               precal_art_5000: precal@5000 {
+                                       reg = <0x5000 0x2f20>;
+                               };
                        };
                };
 
@@ -83,12 +85,14 @@
                        reg = <0x120000 0x80000>;
                        read-only;
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
 
-                       macaddr_mac_0: mac-address@0 {
-                               reg = <0x0 0x6>;
+                               macaddr_mac_0: mac-address@0 {
+                                       reg = <0x0 0x6>;
+                               };
                        };
                };