ath79: ar: convert to nvmem-layout

Will allow removing deprecated mac-address-increment.

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

target/linux/ath79/dts/ar7161_aruba_ap-105.dts

@@ -159,7 +159,6 @@
 
 			hwinfo: partition@fe0000 {
 				reg = <0xfe0000 0x10000>;
-				compatible = "nvmem-cells";
 				label = "hwinfo";
 				read-only;
 

target/linux/ath79/dts/ar7161_aruba_ap-175.dts

@@ -187,6 +187,16 @@
 				label = "hwinfo";
 				reg = <0xfe0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_hwinfo_1c: macaddr@1c {
+						reg = <0x1c 0x6>;
+					};
+				};
 			};
 
 			partition@ff0000 {
@@ -198,16 +208,6 @@
 	};
 };
 
-&hwinfo {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_hwinfo_1c: macaddr@1c {
-		reg = <0x1c 0x6>;
-	};
-};
-
 &i2c0 {
 	gpio_ext: gpio@21 {
 		status = "okay";

target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi

@@ -148,6 +148,20 @@
 				label = "art";
 				reg = <0x0050000 0x0010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_120c: macaddr@120c {
+						reg = <0x120c 0x6>;
+					};
+
+					macaddr_art_520c: macaddr@520c {
+						reg = <0x520c 0x6>;
+					};
+				};
 			};
 
 			partition@60000 {
@@ -246,17 +260,3 @@
 
 	phy-handle = <&phy4>;
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_120c: macaddr@120c {
-		reg = <0x120c 0x6>;
-	};
-
-	macaddr_art_520c: macaddr@520c {
-		reg = <0x520c 0x6>;
-	};
-};

target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts

@@ -186,7 +186,6 @@
 			};
 
 			partition@660000 {
-				compatible = "nvmem-cells";
 				label = "caldata";
 				reg = <0x660000 0x010000>;
 				read-only;

target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts

@@ -158,16 +158,19 @@
 				label = "Atheros Board Data";
 				reg = <0xff0000 0x10000>;
 				read-only;
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
 
-				macaddr_wan: macaddr@1000 {
-					reg = <0x1000 0x6>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_lan: macaddr@1006 {
-					reg = <0x1006 0x6>;
+					macaddr_wan: macaddr@1000 {
+						reg = <0x1000 0x6>;
+					};
+
+					macaddr_lan: macaddr@1006 {
+						reg = <0x1006 0x6>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar7161_meraki_mr16.dts

@@ -141,6 +141,16 @@
 				label = "config";
 				reg = <0x80000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_config_66: macaddr@66 {
+						reg = <0x66 0x6>;
+					};
+				};
 			};
 
 			partition@a0000 {
@@ -157,13 +167,3 @@
 		};
 	};
 };
-
-&config {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_config_66: macaddr@66 {
-		reg = <0x66 0x6>;
-	};
-};

target/linux/ath79/dts/ar7161_netgear_wndap360.dts

@@ -112,28 +112,30 @@
 				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>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				macaddr_art_120c: macaddr@120c {
-					reg = <0x120c 0x6>;
-				};
+					macaddr_art_120c: macaddr@120c {
+						reg = <0x120c 0x6>;
+					};
 
-				macaddr_art_520c: macaddr@520c {
-					reg = <0x520c 0x6>;
-				};
+					macaddr_art_520c: macaddr@520c {
+						reg = <0x520c 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0xeb8>;
-				};
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0xeb8>;
+					};
 
-				calibration_art_5000: calibration@5000 {
-					reg = <0x5000 0xeb8>;
+					calibration_art_5000: calibration@5000 {
+						reg = <0x5000 0xeb8>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts

@@ -35,6 +35,32 @@
 		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>;
+			};
+
+			cal_art_1000: cal@1000 {
+				reg = <0x1000 0xeb8>;
+			};
+
+			cal_art_5000: cal@5000 {
+				reg = <0x5000 0xeb8>;
+			};
+		};
 	};
 };
 
@@ -57,29 +83,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_c: macaddr@c {
-		reg = <0xc 0x6>;
-	};
-
-	cal_art_1000: cal@1000 {
-		reg = <0x1000 0xeb8>;
-	};
-
-	cal_art_5000: cal@5000 {
-		reg = <0x5000 0xeb8>;
-	};
-};

target/linux/ath79/dts/ar7161_netgear_wndr3700.dts

@@ -35,6 +35,32 @@
 		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>;
+			};
+
+			macaddr_art_c: macaddr@c {
+				reg = <0xc 0x6>;
+			};
+
+			cal_art_1000: cal@1000 {
+				reg = <0x1000 0xeb8>;
+			};
+
+			cal_art_5000: cal@5000 {
+				reg = <0x5000 0xeb8>;
+			};
+		};
 	};
 };
 
@@ -76,29 +102,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_c: macaddr@c {
-		reg = <0xc 0x6>;
-	};
-
-	cal_art_1000: cal@1000 {
-		reg = <0x1000 0xeb8>;
-	};
-
-	cal_art_5000: cal@5000 {
-		reg = <0x5000 0xeb8>;
-	};
-};

target/linux/ath79/dts/ar7161_netgear_wndr3800.dts

@@ -36,6 +36,32 @@
 		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>;
+			};
+
+			cal_art_1000: cal@1000 {
+				reg = <0x1000 0xeb8>;
+			};
+
+			cal_art_5000: cal@5000 {
+				reg = <0x5000 0xeb8>;
+			};
+		};
 	};
 };
 
@@ -58,29 +84,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_c: macaddr@c {
-		reg = <0xc 0x6>;
-	};
-
-	cal_art_1000: cal@1000 {
-		reg = <0x1000 0xeb8>;
-	};
-
-	cal_art_5000: cal@5000 {
-		reg = <0x5000 0xeb8>;
-	};
-};

target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts

@@ -36,6 +36,32 @@
 		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>;
+			};
+
+			cal_art_1000: cal@1000 {
+				reg = <0x1000 0xeb8>;
+			};
+
+			cal_art_5000: cal@5000 {
+				reg = <0x5000 0xeb8>;
+			};
+		};
 	};
 };
 
@@ -58,29 +84,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_c: macaddr@c {
-		reg = <0xc 0x6>;
-	};
-
-	cal_art_1000: cal@1000 {
-		reg = <0x1000 0xeb8>;
-	};
-
-	cal_art_5000: cal@5000 {
-		reg = <0x5000 0xeb8>;
-	};
-};

target/linux/ath79/dts/ar7161_netgear_wndrmac-v1.dts

@@ -35,6 +35,32 @@
 		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>;
+			};
+
+			cal_art_1000: cal@1000 {
+				reg = <0x1000 0xeb8>;
+			};
+
+			cal_art_5000: cal@5000 {
+				reg = <0x5000 0xeb8>;
+			};
+		};
 	};
 };
 
@@ -57,29 +83,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_c: macaddr@c {
-		reg = <0xc 0x6>;
-	};
-
-	cal_art_1000: cal@1000 {
-		reg = <0x1000 0xeb8>;
-	};
-
-	cal_art_5000: cal@5000 {
-		reg = <0x5000 0xeb8>;
-	};
-};

target/linux/ath79/dts/ar7161_netgear_wndrmac-v2.dts

@@ -36,6 +36,32 @@
 		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>;
+			};
+
+			cal_art_1000: cal@1000 {
+				reg = <0x1000 0xeb8>;
+			};
+
+			cal_art_5000: cal@5000 {
+				reg = <0x5000 0xeb8>;
+			};
+		};
 	};
 };
 
@@ -58,29 +84,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_c: macaddr@c {
-		reg = <0xc 0x6>;
-	};
-
-	cal_art_1000: cal@1000 {
-		reg = <0x1000 0xeb8>;
-	};
-
-	cal_art_5000: cal@5000 {
-		reg = <0x5000 0xeb8>;
-	};
-};

target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi

@@ -223,21 +223,3 @@
 &usb_phy {
 	status = "okay";
 };
-
-&board_data {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_bdata_60: macaddr@60 {
-		reg = <0x60 0x6>;
-	};
-
-	macaddr_bdata_66: macaddr@66 {
-		reg = <0x66 0x6>;
-	};
-
-	macaddr_bdata_76: macaddr@76 {
-		reg = <0x76 0x6>;
-	};
-};

target/linux/ath79/dts/ar7161_ruckus_zf7341.dts

@@ -6,3 +6,23 @@
 	model = "Ruckus ZoneFlex 7341[-U]";
 	compatible = "ruckus,zf7341", "qca,ar7161";
 };
+
+&board_data {
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		macaddr_bdata_60: macaddr@60 {
+			reg = <0x60 0x6>;
+		};
+
+		macaddr_bdata_66: macaddr@66 {
+			reg = <0x66 0x6>;
+		};
+
+		macaddr_bdata_76: macaddr@76 {
+			reg = <0x76 0x6>;
+		};
+	};
+};

target/linux/ath79/dts/ar7161_ruckus_zf7351.dts

@@ -113,3 +113,23 @@
 		gpio-hog;
 	};
 };
+
+&board_data {
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		macaddr_bdata_60: macaddr@60 {
+			reg = <0x60 0x6>;
+		};
+
+		macaddr_bdata_66: macaddr@66 {
+			reg = <0x66 0x6>;
+		};
+
+		macaddr_bdata_76: macaddr@76 {
+			reg = <0x76 0x6>;
+		};
+	};
+};

target/linux/ath79/dts/ar7161_ruckus_zf7363.dts

@@ -33,7 +33,25 @@
 };
 
 &board_data {
-	macaddr_bdata_6c: macaddr@6c {
-		reg = <0x6c 0x6>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		macaddr_bdata_60: macaddr@60 {
+			reg = <0x60 0x6>;
+		};
+
+		macaddr_bdata_66: macaddr@66 {
+			reg = <0x66 0x6>;
+		};
+
+		macaddr_bdata_6c: macaddr@6c {
+			reg = <0x6c 0x6>;
+		};
+
+		macaddr_bdata_76: macaddr@76 {
+			reg = <0x76 0x6>;
+		};
 	};
 };

target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts

@@ -147,6 +147,16 @@
 				reg = <0x3f0000 0x10000>;
 				label = "art";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_120c: macaddr@120c {
+						reg = <0x120c 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -184,13 +194,3 @@
 		pinctrl-single,bits = <0x0 0x0 0xf8>;
 	};
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_120c: macaddr@120c {
-		reg = <0x120c 0x6>;
-	};
-};

target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts

@@ -96,11 +96,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>;
+		};
 	};
 };

target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts

@@ -168,6 +168,20 @@
 				label = "art";
 				reg = <0x3f0000 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>;
+					};
+				};
 			};
 		};
 	};
@@ -199,17 +213,3 @@
 		gpio-controller;
 	};
 };
-
-&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/ar7240_netgear_wnr612-v2.dtsi

@@ -101,6 +101,20 @@
 				reg = <0x3f0000 0x10000>;
 				label = "art";
 				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>;
+					};
+				};
 			};
 		};
 	};
@@ -132,17 +146,3 @@
 		gpio-controller;
 	};
 };
-
-&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/ar7240_openmesh_om2p-v1.dts

@@ -127,20 +127,22 @@
 				reg = <0xfc0000 0x040000>;
 				read-only;
 
-				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>;
+					};
 
-				macaddr_art_6: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
+					macaddr_art_6: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0x440>;
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar7240_ruckus_zf7025.dts

@@ -150,6 +150,24 @@
 				reg = <0xfc0000 0x40000>;
 				label = "board-data";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_board_data_60: macaddr@60 {
+						reg = <0x60 0x6>;
+					};
+
+					macaddr_board_data_66: macaddr@66 {
+						reg = <0x66 0x6>;
+					};
+
+					macaddr_board_data_6c: macaddr@6c {
+						reg = <0x6c 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -176,21 +194,3 @@
 		nvmem-cell-names = "mac-address";
 	};
 };
-
-&board_data {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_board_data_60: macaddr@60 {
-		reg = <0x60 0x6>;
-	};
-
-	macaddr_board_data_66: macaddr@66 {
-		reg = <0x66 0x6>;
-	};
-
-	macaddr_board_data_6c: macaddr@6c {
-		reg = <0x6c 0x6>;
-	};
-};

target/linux/ath79/dts/ar7240_tplink.dtsi

@@ -77,6 +77,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -116,13 +126,3 @@
 		pinctrl-single,bits = <0x0 0x0 0xf8>;
 	};
 };
-
-&uboot {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_uboot_1fc00: macaddr@1fc00 {
-		reg = <0x1fc00 0x6>;
-	};
-};

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

@@ -171,6 +171,20 @@
 				label = "art";
 				reg = <0x3f0000 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>;
+					};
+				};
 			};
 		};
 	};
@@ -204,17 +218,3 @@
 		gpio-controller;
 	};
 };
-
-&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/ar7241_netgear_wnr2200-16m.dts

@@ -35,6 +35,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>;
+			};
+		};
 	};
 };
 
@@ -53,17 +67,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>;
-	};
-};

target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts

@@ -35,6 +35,20 @@
 		label = "art";
 		reg = <0x7f0000 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>;
+			};
+		};
 	};
 };
 
@@ -53,17 +67,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>;
-	};
-};

target/linux/ath79/dts/ar7241_tplink.dtsi

@@ -64,6 +64,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -106,13 +116,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/ar7241_tplink_tl-wr842n-v1.dts

@@ -102,6 +102,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -146,13 +156,3 @@
 	nvmem-cell-names = "mac-address";
 	mac-address-increment = <1>;
 };
-
-&uboot {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_uboot_1fc00: macaddr@1fc00 {
-		reg = <0x1fc00 0x6>;
-	};
-};

target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts

@@ -87,20 +87,22 @@
 				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>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				macaddr_art_6: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
+					macaddr_art_6: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0xeb8>;
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0xeb8>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi

@@ -73,16 +73,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>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0x440>;
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts

@@ -20,11 +20,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>;
+		};
 	};
 };

target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts

@@ -138,16 +138,18 @@
 				label = "art";
 				read-only;
 
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_art_120c: macaddr@120c {
-					reg = <0x120c 0x6>;
-				};
+					macaddr_art_120c: macaddr@120c {
+						reg = <0x120c 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0xeb8>;
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0xeb8>;
+					};
 				};
 			};
 

target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts

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

target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts

@@ -88,11 +88,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>;
+		};
 	};
 };

target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts

@@ -88,11 +88,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>;
+		};
 	};
 };

target/linux/ath79/dts/ar7242_meraki_mr12.dts

@@ -140,6 +140,16 @@
 				label = "config";
 				reg = <0x80000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_config_66: macaddr@66 {
+						reg = <0x66 0x6>;
+					};
+				};
 			};
 
 			partition@a0000 {
@@ -156,13 +166,3 @@
 		};
 	};
 };
-
-&config {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_config_66: macaddr@66 {
-		reg = <0x66 0x6>;
-	};
-};

target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts

@@ -107,6 +107,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 {
@@ -119,6 +129,16 @@
 				label = "art";
 				reg = <0x7f0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_art_1000: cal@1000 {
+						reg = <0x1000 0x440>;
+					};
+				};
 			};
 		};
 	};
@@ -157,23 +177,3 @@
 		full-duplex;
 	};
 };
-
-&uboot {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_uboot_1fc00: macaddr@1fc00 {
-		reg = <0x1fc00 0x6>;
-	};
-};
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	cal_art_1000: cal@1000 {
-		reg = <0x1000 0x440>;
-	};
-};

target/linux/ath79/dts/ar7242_ubnt_edgeswitch-5xp.dts

@@ -75,13 +75,3 @@
 		full-duplex;
 	};
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-};

target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts

@@ -186,13 +186,3 @@
 		full-duplex;
 	};
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-};

target/linux/ath79/dts/ar7242_ubnt_sw.dtsi

@@ -104,6 +104,20 @@
 				reg = <0x7f0000 0x010000>;
 				label = "art";
 				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>;
+					};
+				};
 			};
 		};
 	};
@@ -127,13 +141,3 @@
 	nvmem-cells = <&macaddr_art_6>;
 	nvmem-cell-names = "mac-address";
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_6: macaddr@6 {
-		reg = <0x6 0x6>;
-	};
-};

target/linux/ath79/dts/ar724x_ubnt_xm.dtsi

@@ -62,6 +62,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>;
+					};
+				};
 			};
 		};
 	};
@@ -89,17 +103,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>;
-	};
-};

target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi

@@ -137,6 +137,16 @@
 				label = "art";
 				reg = <0x1fe0000 0x020000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_1120c: macaddr@1120c {
+						reg = <0x1120c 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -250,13 +260,3 @@
 &usb_phy {
 	status = "okay";
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_1120c: macaddr@1120c {
-		reg = <0x1120c 0x6>;
-	};
-};

target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts

@@ -73,6 +73,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@1 {
@@ -121,13 +131,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/ar9132_tplink_tl-wr1043nd-v1.dts

@@ -99,6 +99,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 {
@@ -136,13 +146,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/ar9132_tplink_tl-wr941-v2.dts

@@ -122,6 +122,16 @@
 				label = "u-boot";
 				reg = <0x000000 0x20000>;
 				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/ar9330_glinet_gl-ar150.dts

@@ -105,6 +105,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>;
+					};
+				};
 			};
 		};
 	};
@@ -138,13 +148,3 @@
 	nvmem-cells = <&macaddr_art_0>;
 	nvmem-cell-names = "mac-address";
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-};

target/linux/ath79/dts/ar9330_openmesh_om2p.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>;
+					};
+				};
 			};
 		};
 	};
@@ -146,17 +160,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/ar9330_pqi_air-pen.dts

@@ -86,6 +86,20 @@
 				label = "art";
 				reg = <0x050000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_2: macaddr@2 {
+						reg = <0x2 0x6>;
+					};
+
+					macaddr_art_1002: macaddr@1002 {
+						reg = <0x1002 0x6>;
+					};
+				};
 			};
 
 			partition@60000 {
@@ -136,17 +150,3 @@
 	nvmem-cells = <&macaddr_art_2>;
 	nvmem-cell-names = "mac-address";
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_2: macaddr@2 {
-		reg = <0x2 0x6>;
-	};
-
-	macaddr_art_1002: macaddr@1002 {
-		reg = <0x1002 0x6>;
-	};
-};

target/linux/ath79/dts/ar9330_ziking_cpe46b.dts

@@ -78,6 +78,16 @@
 				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>;
+					};
+				};
 			};
 		};
 	};
@@ -103,13 +113,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/ar9331_8dev_carambola2.dts

@@ -92,6 +92,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>;
+					};
+				};
 			};
 		};
 	};
@@ -124,17 +138,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/ar9331_alfa-network_ap121f.dtsi

@@ -101,20 +101,22 @@
 				reg = <0x040000 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_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				macaddr_art_1002: macaddr@1002 {
-					reg = <0x1002 0x6>;
+					macaddr_art_1002: macaddr@1002 {
+						reg = <0x1002 0x6>;
+					};
 				};
 			};
 

target/linux/ath79/dts/ar9331_etactica_eg200.dts

@@ -109,6 +109,16 @@
 			art: art@ff0000 {
 				reg = <0xff0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -118,13 +128,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>;
-	};
-};

target/linux/ath79/dts/ar9331_glinet_6408.dts

@@ -28,6 +28,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -61,13 +71,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/ar9331_glinet_6416.dts

@@ -28,6 +28,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -61,13 +71,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/ar9331_glinet_gl-mifi.dts

@@ -113,6 +113,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>;
+					};
+				};
 			};
 		};
 	};
@@ -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/ar9331_glinet_gl-usb150.dts

@@ -108,6 +108,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>;
+					};
+				};
 			};
 		};
 	};
@@ -118,13 +128,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/ar9331_hak5_lan-turtle.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 {
@@ -92,13 +102,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/ar9331_hak5_wifi-pineapple-nano.dts

@@ -102,6 +102,16 @@
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_6: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -120,13 +130,3 @@
 
 	mtd-cal-data = <&art 0x1000>;
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_6: macaddr@6 {
-		reg = <0x6 0x6>;
-	};
-};

target/linux/ath79/dts/ar9331_hiwifi_hc6361.dts

@@ -77,7 +77,6 @@
 			};
 
 			bdinfo: partition@10000 {
-				compatible = "nvmem-cells";
 				reg = <0x10000 0x10000>;
 				label = "bdinfo";
 				read-only;

target/linux/ath79/dts/ar9331_onion_omega.dts

@@ -100,6 +100,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/ar9331_pisen_ts-d084.dts

@@ -55,6 +55,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			firmware: partition@20000 {
@@ -106,13 +116,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/ar9331_pisen_wmm003n.dts

@@ -63,6 +63,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			firmware: partition@20000 {
@@ -115,13 +125,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/ar9331_teltonika_rut230-v1.dts

@@ -144,6 +144,16 @@
 				label = "config";
 				reg = <0x20000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_config_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
+				};
 			};
 
 			art: partition@30000 {
@@ -194,13 +204,3 @@
 	nvmem-cell-names = "mac-address";
 	mac-address-increment = <2>;
 };
-
-&config {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_config_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-};

target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts

@@ -113,6 +113,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 {
@@ -162,13 +172,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/ar9331_tplink_tl-mr3040-v2.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 {
@@ -151,13 +161,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/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi

@@ -60,6 +60,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -114,13 +124,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/ar9331_tplink_tl-wr710n-8m.dtsi

@@ -25,6 +25,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -59,13 +69,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/ar9331_tplink_tl-wr741nd-v4.dtsi

@@ -101,6 +101,16 @@
 				reg = <0x0 0x20000>;
 				label = "u-boot";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_uboot_1fc00: macaddr@1fc00 {
+						reg = <0x1fc00 0x6>;
+					};
+				};
 			};
 
 			firmware: 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/ar9341_engenius_eap300-v2.dts

@@ -57,11 +57,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>;
+		};
 	};
 };

target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts

@@ -88,11 +88,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>;
+		};
 	};
 };

target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi

@@ -132,6 +132,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>;
+					};
+				};
 			};
 		};
 	};
@@ -156,17 +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>;
-	};
-
-	macaddr_art_6: macaddr@6 {
-		reg = <0x6 0x6>;
-	};
-};

target/linux/ath79/dts/ar9341_pcs_cr3000.dts

@@ -118,6 +118,16 @@
 				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>;
+					};
+				};
 			};
 		};
 	};
@@ -150,13 +160,3 @@
 		switch-phy-swap = <1>;
 	};
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-};

target/linux/ath79/dts/ar9341_pisen_wmb001n.dts

@@ -180,6 +180,16 @@
 				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>;
+					};
+				};
 			};
 		};
 	};
@@ -214,13 +224,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>;
-	};
-};

target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts

@@ -64,6 +64,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 {
@@ -106,13 +116,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/ar9341_tplink_tl-wa.dtsi

@@ -32,6 +32,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 {
@@ -75,13 +85,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/ar9341_tplink_tl-wr841-v8.dts

@@ -47,6 +47,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 {
@@ -81,13 +91,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/ar9341_tplink_tl-wr842n-v2.dts

@@ -65,6 +65,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 {
@@ -109,13 +119,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/ar9341_tplink_tl-wr941nd-v5.dts

@@ -57,6 +57,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 {
@@ -91,13 +101,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/ar9342_ruckus_zf7321.dts

@@ -49,6 +49,26 @@
 	};
 };
 
+&board_data {
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		macaddr_board_data_60: macaddr@60 {
+			reg = <0x60 0x6>;
+		};
+
+		macaddr_board_data_66: macaddr@66 {
+			reg = <0x66 0x6>;
+		};
+
+		cal_board_data_41000: cal@41000 {
+			reg = <0x41000 0x440>;
+		};
+	};
+};
+
 &eth0 {
 	nvmem-cells = <&macaddr_board_data_66>;
 };

target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts

@@ -63,20 +63,22 @@
 				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>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				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>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar9342_ubnt_wa.dtsi

@@ -70,6 +70,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>;
+					};
+				};
 			};
 		};
 	};
@@ -81,13 +91,3 @@
 	ieee80211-freq-limit = <2402000 2482000>;
 	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/ar9342_ubnt_xw.dtsi

@@ -98,6 +98,16 @@
 				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>;
+					};
+				};
 			};
 		};
 	};
@@ -113,13 +123,3 @@
 	nvmem-cells = <&macaddr_art_0>;
 	nvmem-cell-names = "mac-address";
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-};

target/linux/ath79/dts/ar9342_zyxel_nwa11xx.dtsi

@@ -92,8 +92,6 @@
 				reg = <0xfe0000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-
 				nvmem-layout {
 					compatible = "fixed-layout";
 					#address-cells = <1>;
@@ -118,16 +116,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>;
+					};
 
-				macaddr_art_1002: macaddr@1002 {
-					reg = <0x1002 0x6>;
+					macaddr_art_1002: macaddr@1002 {
+						reg = <0x1002 0x6>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts

@@ -141,6 +141,16 @@
 				label = "hw-info";
 				reg = <0x90000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_hw_info_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
+				};
 			};
 
 			partition@a0000 {
@@ -230,13 +240,3 @@
 		rxdv-delay = <1>;
 	};
 };
-
-&hw_info {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_hw_info_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-};

target/linux/ath79/dts/ar9344_alfa-network_n5q.dts

@@ -136,24 +136,26 @@
 				reg = <0x070000 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_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				macaddr_art_6: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
+					macaddr_art_6: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
 
-				macaddr_art_1002: macaddr@1002 {
-					reg = <0x1002 0x6>;
+					macaddr_art_1002: macaddr@1002 {
+						reg = <0x1002 0x6>;
+					};
 				};
 			};
 

target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts

@@ -107,19 +107,21 @@
 };
 
 &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>;
+		};
 
-	calibration_art_1000: calibration@1000 {
-		reg = <0x1000 0x440>;
-	};
+		calibration_art_1000: calibration@1000 {
+			reg = <0x1000 0x440>;
+		};
 
-	calibration_art_5000: calibration@5000 {
-		reg = <0x5000 0x440>;
+		calibration_art_5000: calibration@5000 {
+			reg = <0x5000 0x440>;
+		};
 	};
 };

target/linux/ath79/dts/ar9344_atheros_db120.dts

@@ -140,24 +140,26 @@
 				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>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				macaddr_art_6: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
+					macaddr_art_6: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0x440>;
-				};
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 
-				calibration_art_5000: calibration@5000 {
-					reg = <0x5000 0x440>;
+					calibration_art_5000: calibration@5000 {
+						reg = <0x5000 0x440>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts

@@ -100,6 +100,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 {
@@ -139,17 +153,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/ar9344_compex_wpj344-16m.dts

@@ -78,6 +78,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 @@
 	phy-mode = "rgmii";
 	phy-handle = <&phy0>;
 };
-
-&uboot {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_uboot_2e010: macaddr@2e010 {
-		reg = <0x2e010 0x6>;
-	};
-};

target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi

@@ -116,6 +116,16 @@
 				label = "art";
 				reg = <0xff0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_1002: macaddr@1002 {
+						reg = <0x1002 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -169,13 +179,3 @@
 		>;
 	};
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_1002: macaddr@1002 {
-		reg = <0x1002 0x6>;
-	};
-};

target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi

@@ -116,8 +116,6 @@
 				reg = <0xfe0000 0x010000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-
 				nvmem-layout {
 					compatible = "fixed-layout";
 					#address-cells = <1>;
@@ -142,16 +140,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>;
 
-				cal_art_1000: cal@1000 {
-					reg = <0x1000 0x440>;
-				};
+					cal_art_1000: cal@1000 {
+						reg = <0x1000 0x440>;
+					};
 
-				cal_art_5000: cal@5000 {
-					reg = <0x5000 0x440>;
+					cal_art_5000: cal@5000 {
+						reg = <0x5000 0x440>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar9344_engenius_eap600.dts

@@ -48,19 +48,21 @@
 };
 
 &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>;
+		};
 
-	calibration_art_1000: calibration@1000 {
-		reg = <0x1000 0x440>;
-	};
+		calibration_art_1000: calibration@1000 {
+			reg = <0x1000 0x440>;
+		};
 
-	calibration_art_5000: calibration@5000 {
-		reg = <0x5000 0x440>;
+		calibration_art_5000: calibration@5000 {
+			reg = <0x5000 0x440>;
+		};
 	};
 };

target/linux/ath79/dts/ar9344_engenius_ecb600.dts

@@ -43,19 +43,21 @@
 };
 
 &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>;
+		};
 
-	calibration_art_1000: calibration@1000 {
-		reg = <0x1000 0x440>;
-	};
+		calibration_art_1000: calibration@1000 {
+			reg = <0x1000 0x440>;
+		};
 
-	calibration_art_5000: calibration@5000 {
-		reg = <0x5000 0x440>;
+		calibration_art_5000: calibration@5000 {
+			reg = <0x5000 0x440>;
+		};
 	};
 };

target/linux/ath79/dts/ar9344_netgear_pgzng1.dts

@@ -289,20 +289,22 @@
 			reg = <0xffe0000 0x20000>;
 			read-only;
 
-			compatible = "nvmem-cells";
-			#address-cells = <1>;
-			#size-cells = <1>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_caldata_0: macaddr@0 {
-				reg = <0x0 0x6>;
-			};
+				macaddr_caldata_0: macaddr@0 {
+					reg = <0x0 0x6>;
+				};
 
-			macaddr_caldata_6: macaddr@6 {
-				reg = <0x6 0x6>;
-			};
+				macaddr_caldata_6: macaddr@6 {
+					reg = <0x6 0x6>;
+				};
 
-			cal_caldata_1000: cal@1000 {
-				reg = <0x1000 0x440>;
+				cal_caldata_1000: cal@1000 {
+					reg = <0x1000 0x440>;
+				};
 			};
 		};
 	};

target/linux/ath79/dts/ar9344_netgear_r6100.dts

@@ -130,6 +130,32 @@
 			label = "caldata";
 			reg = <0x0020000 0x0040000>;
 			read-only;
+
+			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>;
+				};
+
+				macaddr_caldata_0: macaddr@0 {
+					reg = <0x0 0x6>;
+				};
+
+				macaddr_caldata_6: macaddr@6 {
+					reg = <0x6 0x6>;
+				};
+
+				macaddr_caldata_c: macaddr@c {
+					reg = <0xc 0x6>;
+				};
+			};
 		};
 
 		partition@60000 {
@@ -204,29 +230,3 @@
 	nvmem-cells = <&cal_ath9k>;
 	nvmem-cell-names = "calibration";
 };
-
-&caldata {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	cal_ath9k: calibration@1000 {
-		reg = <0x1000 0x440>;
-	};
-
-	cal_ath10k: calibration@5000 {
-		reg = <0x5000 0x844>;
-	};
-
-	macaddr_caldata_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-
-	macaddr_caldata_6: macaddr@6 {
-		reg = <0x6 0x6>;
-	};
-
-	macaddr_caldata_c: macaddr@c {
-		reg = <0xc 0x6>;
-	};
-};

target/linux/ath79/dts/ar9344_netgear_wndr.dtsi

@@ -127,6 +127,28 @@
 			label = "caldata";
 			reg = <0x80000 0x40000>;
 			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>;
+				};
+			};
 		};
 
 		partition@c0000 {
@@ -259,25 +281,3 @@
 		gpio-controller;
 	};
 };
-
-&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>;
-	};
-};

target/linux/ath79/dts/ar9344_ocedo_raccoon.dts

@@ -114,28 +114,30 @@
 				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>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				macaddr_art_6: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
+					macaddr_art_6: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
 
-				macaddr_art_c: macaddr@c {
-					reg = <0xc 0x6>;
-				};
+					macaddr_art_c: macaddr@c {
+						reg = <0xc 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0x440>;
-				};
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 
-				calibration_art_5000: calibration@5000 {
-					reg = <0x5000 0x440>;
+					calibration_art_5000: calibration@5000 {
+						reg = <0x5000 0x440>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi

@@ -75,20 +75,22 @@
 				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>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0x440>;
-				};
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 
-				calibration_art_5000: calibration@5000 {
-					reg = <0x5000 0x440>;
+					calibration_art_5000: calibration@5000 {
+						reg = <0x5000 0x440>;
+					};
 				};
 			};
 		};

target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts

@@ -153,20 +153,22 @@
 				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>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				calibration_art_1000: calibration@1000 {
-					reg = <0x1000 0x440>;
-				};
+					calibration_art_1000: calibration@1000 {
+						reg = <0x1000 0x440>;
+					};
 
-				calibration_art_5000: calibration@5000 {
-					reg = <0x5000 0x440>;
+					calibration_art_5000: calibration@5000 {
+						reg = <0x5000 0x440>;
+					};
 				};
 			};
 		};