ath79: qca: convert to nvmem-layout

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

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

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

target/linux/ath79/dts/qca9531_alcatel_hh40v.dts

@@ -119,7 +119,8 @@
 				reg = <0xff0000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -141,6 +142,7 @@
 				};
 			};
 		};
+	};
 };
 
 &mdio0 {

target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi

@@ -87,7 +87,8 @@
 				reg = <0x070000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -99,6 +100,7 @@
 						reg = <0x1002 0x6>;
 					};
 				};
+			};
 
 			partition@80000 {
 				compatible = "denx,uimage";

target/linux/ath79/dts/qca9531_asus_rp-ac51.dts

@@ -97,7 +97,8 @@
 				reg = <0x050000 0x10000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -109,6 +110,7 @@
 						reg = <0x1002 0x6>;
 					};
 				};
+			};
 
 			partition@60000 {
 				compatible = "denx,uimage";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts

@@ -119,7 +119,8 @@
 				reg = <0xff0000 0x10000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -137,6 +138,7 @@
 				};
 			};
 		};
+	};
 };
 
 &eth0 {

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

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

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

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

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

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

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

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

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

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

target/linux/ath79/dts/qca9533_kuwfi_c910.dts

@@ -140,7 +140,8 @@
 				reg = <0xff0000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -154,6 +155,7 @@
 				};
 			};
 		};
+	};
 };
 
 &usb0 {

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

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

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

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

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

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

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

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

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

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

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

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

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

target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi

@@ -47,7 +47,8 @@
 				reg = <0xff0000 0x10000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -57,6 +58,7 @@
 				};
 			};
 		};
+	};
 };
 
 &wmac {

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

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

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

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

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

target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts

@@ -90,7 +90,17 @@
 };
 
 &art {
+	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>;
 		};
+	};
 };

target/linux/ath79/dts/qca9557_dongwon_dw02-412h.dtsi

@@ -102,7 +102,8 @@
 				reg = <0x1f0000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -120,6 +121,7 @@
 				};
 			};
 		};
+	};
 };
 
 &nand {

target/linux/ath79/dts/qca9557_engenius_eap1200h.dts

@@ -62,7 +62,8 @@
 		reg = <0xff0000 0x010000>;
 		read-only;
 
-		compatible = "nvmem-cells";
+		nvmem-layout {
+			compatible = "fixed-layout";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
@@ -78,6 +79,7 @@
 				reg = <0x5000 0x844>;
 			};
 		};
+	};
 };
 
 &mdio0 {

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

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

target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts

@@ -98,11 +98,13 @@
 };
 
 &art {
-	compatible = "nvmem-cells";
+	nvmem-layout {
+		compatible = "fixed-layout";
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		macaddr_art_0: macaddr@0 {
 			reg = <0x0 0x6>;
 		};
+	};
 };

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

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

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

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

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

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

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

target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts

@@ -90,7 +90,17 @@
 };
 
 &art {
+	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>;
 		};
+	};
 };

target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts

@@ -116,7 +116,17 @@
 };
 
 &art {
+	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>;
 		};
+	};
 };

target/linux/ath79/dts/qca9558_dlink_dap-3662-a1.dts

@@ -104,7 +104,17 @@
 };
 
 &art {
+	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>;
 		};
+	};
 };

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,7 +150,8 @@
 				reg = <0x080000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -160,6 +159,7 @@
 						reg = <0x1000 0x440>;
 					};
 				};
+			};
 
 			partition@90000 {
 				compatible = "seama";

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

target/linux/ath79/dts/qca9558_engenius_eap1750h.dts

@@ -62,7 +62,8 @@
 		reg = <0xff0000 0x010000>;
 		read-only;
 
-		compatible = "nvmem-cells";
+		nvmem-layout {
+			compatible = "fixed-layout";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
@@ -78,6 +79,7 @@
 				reg = <0x5000 0x844>;
 			};
 		};
+	};
 };
 
 &mdio0 {

target/linux/ath79/dts/qca9558_engenius_ews660ap.dts

@@ -50,7 +50,8 @@
 		reg = <0xff0000 0x010000>;
 		read-only;
 
-		compatible = "nvmem-cells";
+		nvmem-layout {
+			compatible = "fixed-layout";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
@@ -66,6 +67,7 @@
 				reg = <0x5000 0x844>;
 			};
 		};
+	};
 };
 
 &mdio0 {

target/linux/ath79/dts/qca9558_jjplus_jwap230.dts

@@ -84,7 +84,8 @@
 				reg = <0xff0000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -102,6 +103,7 @@
 				};
 			};
 		};
+	};
 };
 
 &mdio0 {

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

target/linux/ath79/dts/qca9558_linksys_ea4500-v3.dts

@@ -90,7 +90,8 @@
 			reg = <0x140000 0x40000>;
 			read-only;
 
-			compatible = "nvmem-cells";
+			nvmem-layout {
+				compatible = "fixed-layout";
 				#address-cells = <1>;
 				#size-cells = <1>;
 
@@ -106,6 +107,7 @@
 					reg = <0x5000 0x440>;
 				};
 			};
+		};
 
 		partition@180000 {
 			label = "s_env";

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

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

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

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

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

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

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

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

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

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

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

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,7 +56,8 @@
 		reg = <0x7f0000 0x010000>;
 		read-only;
 
-		compatible = "nvmem-cells";
+		nvmem-layout {
+			compatible = "fixed-layout";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
@@ -54,6 +65,7 @@
 				reg = <0x1000 0x440>;
 			};
 		};
+	};
 };
 
 &eth0 {
@@ -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>;
-	};
-};

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,7 +57,8 @@
 		reg = <0xff0000 0x010000>;
 		read-only;
 
-		compatible = "nvmem-cells";
+		nvmem-layout {
+			compatible = "fixed-layout";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
@@ -59,6 +70,7 @@
 				reg = <0x5000 0x844>;
 			};
 		};
+	};
 };
 
 &eth0 {
@@ -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>;
-	};
-};

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

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

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

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

target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts

@@ -138,7 +138,8 @@
 				reg = <0x000000 0x020000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -146,6 +147,7 @@
 						reg = <0x1fc00 0x6>;
 					};
 				};
+			};
 
 			partition@20000 {
 				compatible = "tplink,firmware";
@@ -158,7 +160,8 @@
 				reg = <0x7f0000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -172,6 +175,7 @@
 				};
 			};
 		};
+	};
 };
 
 &mdio0 {

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

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

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

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

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

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

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

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