ramips: mt7621: convert to nvmem-layout

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

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

target/linux/ramips/dts/mt7621_adslr_g7.dts

@@ -64,23 +64,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_e00c: macaddr@e00c {
-					reg = <0xe00c 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
+
+					macaddr_factory_e00c: macaddr@e00c {
+						reg = <0xe00c 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_afoundry_ew1200.dts

@@ -71,23 +71,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_alfa-network_ax1800rm.dts

@@ -117,7 +117,6 @@
 			};
 
 			partition@50000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x50000 0x10000>;
 				read-only;

target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts

@@ -245,6 +245,20 @@
 				label = "factory";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -263,17 +277,3 @@
 &uartlite3 {
 	status = "okay";
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_ampedwireless_ally.dtsi

@@ -107,19 +107,22 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x100000 0x40000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x4da8>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x4da8>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_arcadyan_we420223-99.dts

@@ -130,15 +130,18 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "Factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_arcadyan_wg4xx223.dtsi

@@ -79,25 +79,28 @@
 		};
 
 		factory: partition@200000 {
-			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x200000 0x100000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x4da8>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			/* We keep the block below to prevent eth0 MAC
-			 * from randomization. Unique WAN, LAN, WLAN MACs
-			 * are stored in u-boot-env.
-			 */
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x4da8>;
+				};
 
-			/* Default Ralink MAC (00:0c:43:28:80:xx) */
-			macaddr_factory_fff0: macaddr@fff0 {
-				reg = <0xfff0 0x6>;
+				/* We keep the block below to prevent eth0 MAC
+				 * from randomization. Unique WAN, LAN, WLAN MACs
+				 * are stored in u-boot-env.
+				 */
+
+				/* Default Ralink MAC (00:0c:43:28:80:xx) */
+				macaddr_factory_fff0: macaddr@fff0 {
+					reg = <0xfff0 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi

@@ -78,6 +78,16 @@
 				label = "factory";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -110,13 +120,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_asus_rp-ac56.dts

@@ -136,23 +136,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_asus_rp-ac87.dts

@@ -110,23 +110,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_8004: macaddr@8004 {
-					reg = <0x8004 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
+
+					macaddr_factory_8004: macaddr@8004 {
+						reg = <0x8004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_asus_rt-ac57u-v1.dts

@@ -86,27 +86,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi

@@ -80,23 +80,26 @@
 		};
 
 		factory: partition@1e0000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x1e0000 0x100000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x4da8>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x4da8>;
+				};
 
-			macaddr_factory_e000: macaddr@e000 {
-				reg = <0xe000 0x6>;
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
+
+				macaddr_factory_e000: macaddr@e000 {
+					reg = <0xe000 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_asus_rt-ax53u.dts

@@ -99,12 +99,14 @@
 			reg = <0x1e0000 0x100000>;
 			read-only;
 
-			compatible = "nvmem-cells";
-			#address-cells = <1>;
-			#size-cells = <1>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_4: macaddr@4 {
-				reg = <0x4 0x6>;
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_asus_rt-ax54.dts

@@ -91,12 +91,14 @@
 			reg = <0x1e0000 0x100000>;
 			read-only;
 
-			compatible = "nvmem-cells";
-			#address-cells = <1>;
-			#size-cells = <1>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_4: macaddr@4 {
-				reg = <0x4 0x6>;
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_asus_rt-n56u-b1.dts

@@ -105,27 +105,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 
-				macaddr_factory_8004: macaddr@8004 {
-					reg = <0x8004 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
+
+					macaddr_factory_8004: macaddr@8004 {
+						reg = <0x8004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts

@@ -94,24 +94,27 @@
 		};
 
 		factory: partition@200000 {
-			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x200000 0x100000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			sercomm,scpart-id = <2>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x400>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x400>;
+				};
 
-			macaddr_factory_21000: macaddr@21000 {
-				reg = <0x21000 0x6>;
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
+
+				macaddr_factory_21000: macaddr@21000 {
+					reg = <0x21000 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_beeline_smartbox-turbo-plus.dts

@@ -100,24 +100,27 @@
 		};
 
 		factory: partition@200000 {
-			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x200000 0x100000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			sercomm,scpart-id = <2>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x400>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x400>;
+				};
 
-			macaddr_factory_21000: macaddr@21000 {
-				reg = <0x21000 0x6>;
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
+
+				macaddr_factory_21000: macaddr@21000 {
+					reg = <0x21000 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_belkin_rt1800.dts

@@ -86,15 +86,18 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x100000 0x80000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0xe00>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0xe00>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_bolt_arion.dts

@@ -100,23 +100,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts

@@ -133,19 +133,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts

@@ -131,23 +131,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts

@@ -133,23 +133,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_comfast_cf-e390ax.dts

@@ -90,6 +90,16 @@
 				label = "factory";
 				reg = <0x50000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+				};
 			};
 
 			partition@90000 {
@@ -101,16 +111,6 @@
 	};
 };
 
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-};
-
 &gmac0 {
 	nvmem-cells = <&macaddr_factory_e000>;
 	nvmem-cell-names = "mac-address";

target/linux/ramips/dts/mt7621_comfast_cf-ew72-v2.dts

@@ -107,7 +107,6 @@
 			
 			factory: partition@40000  {
 				label = "factory";
-				compatible = "nvmem-cells";
 				reg = <0x40000 0x10000>;
 				read-only;
 

target/linux/ramips/dts/mt7621_cudy_m1800.dts

@@ -148,12 +148,14 @@
 				reg = <0x1ff0000 0x10000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_bdinfo_de00: macaddr@de00 {
-					reg = <0xde00 0x6>;
+					macaddr_bdinfo_de00: macaddr@de00 {
+						reg = <0xde00 0x6>;
+					};
 				};
 			};
 		};

target/linux/ramips/dts/mt7621_cudy_wr1300-v1.dts

@@ -85,19 +85,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 				};
 			};
 
@@ -120,15 +123,18 @@
 			};
 
 			bdinfo: partition@ff0000 {
-				compatible = "nvmem-cells";
 				label = "bdinfo";
 				reg = <0xff0000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				macaddr_bdinfo_de00: macaddr@de00 {
-					reg = <0xde00 0x6>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_bdinfo_de00: macaddr@de00 {
+						reg = <0xde00 0x6>;
+					};
 				};
 			};
 		};

target/linux/ramips/dts/mt7621_cudy_wr2100.dts

@@ -132,19 +132,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 				};
 			};
 
@@ -167,15 +170,18 @@
 			};
 
 			bdinfo: partition@ff0000 {
-				compatible = "nvmem-cells";
 				label = "bdinfo";
 				reg = <0xff0000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				macaddr_bdinfo_de00: macaddr@de00 {
-					reg = <0xde00 0x6>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_bdinfo_de00: macaddr@de00 {
+						reg = <0xde00 0x6>;
+					};
 				};
 			};
 		};

target/linux/ramips/dts/mt7621_cudy_x6-v1.dts

@@ -31,12 +31,14 @@
 		reg = <0x1ff0000 0x10000>;
 		read-only;
 
-		compatible = "nvmem-cells";
-		#address-cells = <1>;
-		#size-cells = <1>;
+		nvmem-layout {
+			compatible = "fixed-layout";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		macaddr_bdinfo_de00: macaddr@de00 {
-			reg = <0xde00 0x6>;
+			macaddr_bdinfo_de00: macaddr@de00 {
+				reg = <0xde00 0x6>;
+			};
 		};
 	};
 };

target/linux/ramips/dts/mt7621_cudy_x6-v2.dts

@@ -31,12 +31,14 @@
 		reg = <0xff0000 0x10000>;
 		read-only;
 
-		compatible = "nvmem-cells";
-		#address-cells = <1>;
-		#size-cells = <1>;
+		nvmem-layout {
+			compatible = "fixed-layout";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		macaddr_bdinfo_de00: macaddr@de00 {
-			reg = <0xde00 0x6>;
+			macaddr_bdinfo_de00: macaddr@de00 {
+				reg = <0xde00 0x6>;
+			};
 		};
 	};
 };

target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts

@@ -115,27 +115,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts

@@ -129,27 +129,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_dlink_dap-x1860-a1.dts

@@ -129,12 +129,14 @@
 			reg = <0x100000 0x80000>;
 			read-only;
 
-			compatible = "nvmem-cells";
-			#address-cells = <1>;
-			#size-cells = <1>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_4: macaddr@4 {
-				reg = <0x4 0x6>;
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_dlink_dir-3060-a1.dts

@@ -111,27 +111,30 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x100000 0x40000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x4da8>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x4da8>;
+				};
 
-			macaddr_factory_e000: macaddr@e000 {
-				reg = <0xe000 0x6>;
-			};
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
 
-			macaddr_factory_e006: macaddr@e006 {
-				reg = <0xe006 0x6>;
+				macaddr_factory_e000: macaddr@e000 {
+					reg = <0xe000 0x6>;
+				};
+
+				macaddr_factory_e006: macaddr@e006 {
+					reg = <0xe006 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_dlink_dir-853-a1.dts

@@ -108,23 +108,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_dlink_dir-853-a3.dts

@@ -105,27 +105,30 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x100000 0x40000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x4da8>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_4: macaddr@4 {
-				reg = <0x4 0x6>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x4da8>;
+				};
 
-			macaddr_factory_e000: macaddr@e000 {
-				reg = <0xe000 0x6>;
-			};
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
 
-			macaddr_factory_e006: macaddr@e006 {
-				reg = <0xe006 0x6>;
+				macaddr_factory_e000: macaddr@e000 {
+					reg = <0xe000 0x6>;
+				};
+
+				macaddr_factory_e006: macaddr@e006 {
+					reg = <0xe006 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts

@@ -83,23 +83,26 @@
 			};
 
 			radio: partition@34000 {
-				compatible = "nvmem-cells";
 				label = "radio";
 				reg = <0x34000 0x4000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				macaddr_radio_4: macaddr@4 {
-					reg = <0x4 0x6>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_radio_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+					macaddr_radio_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 
-				eeprom_radio_2000: eeprom@2000 {
-					reg = <0x2000 0x200>;
+					eeprom_radio_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
+
+					eeprom_radio_2000: eeprom@2000 {
+						reg = <0x2000 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi

@@ -76,27 +76,30 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x100000 0x40000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x4da8>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x4da8>;
+				};
 
-			macaddr_factory_e000: macaddr@e000 {
-				reg = <0xe000 0x6>;
-			};
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
 
-			macaddr_factory_e006: macaddr@e006 {
-				reg = <0xe006 0x6>;
+				macaddr_factory_e000: macaddr@e000 {
+					reg = <0xe000 0x6>;
+				};
+
+				macaddr_factory_e006: macaddr@e006 {
+					reg = <0xe006 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_dlink_dxx-1xx0-x1.dtsi

@@ -93,19 +93,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi

@@ -26,27 +26,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x20000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi

@@ -26,31 +26,34 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_dual-q_h721.dts

@@ -122,12 +122,14 @@
 				reg = <0x40000 0x10000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_edimax_re23s.dts

@@ -86,23 +86,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_8004: macaddr@8004 {
-					reg = <0x8004 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
+
+					macaddr_factory_8004: macaddr@8004 {
+						reg = <0x8004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi

@@ -81,23 +81,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts

@@ -136,23 +136,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_elecom_wrc-1167gs2-b.dts

@@ -50,25 +50,28 @@
 };
 
 &wifi {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 (-1)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-1)>;
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_4: macaddr@4 {
-		reg = <0x4 0x6>;
-	};
+		macaddr_factory_4: macaddr@4 {
+			compatible = "mac-base";
+			reg = <0x4 0x6>;
+			#nvmem-cell-cells = <1>;
+		};
 
-	macaddr_factory_fff4: macaddr@fff4 {
-		reg = <0xfff4 0x6>;
-	};
+		macaddr_factory_fff4: macaddr@fff4 {
+			reg = <0xfff4 0x6>;
+		};
 
-	macaddr_factory_fffa: macaddr@fffa {
-		reg = <0xfffa 0x6>;
+		macaddr_factory_fffa: macaddr@fffa {
+			reg = <0xfffa 0x6>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts

@@ -50,21 +50,24 @@
 };
 
 &wifi {
-	nvmem-cells = <&macaddr_factory_e006>;
+	nvmem-cells = <&macaddr_factory_e006 1>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <1>;
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
+		macaddr_factory_e000: macaddr@e000 {
+			reg = <0xe000 0x6>;
+		};
 
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
+		macaddr_factory_e006: macaddr@e006 {
+			compatible = "mac-base";
+			reg = <0xe006 0x6>;
+			#nvmem-cell-cells = <1>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts

@@ -50,15 +50,17 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
+		macaddr_factory_e000: macaddr@e000 {
+			reg = <0xe000 0x6>;
+		};
 
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
+		macaddr_factory_e006: macaddr@e006 {
+			reg = <0xe006 0x6>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-1750gst2.dts

@@ -50,15 +50,17 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
+		macaddr_factory_e000: macaddr@e000 {
+			reg = <0xe000 0x6>;
+		};
 
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
+		macaddr_factory_e006: macaddr@e006 {
+			reg = <0xe006 0x6>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts

@@ -50,15 +50,17 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
+		macaddr_factory_e000: macaddr@e000 {
+			reg = <0xe000 0x6>;
+		};
 
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
+		macaddr_factory_e006: macaddr@e006 {
+			reg = <0xe006 0x6>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts

@@ -50,15 +50,17 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
+		macaddr_factory_e000: macaddr@e000 {
+			reg = <0xe000 0x6>;
+		};
 
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
+		macaddr_factory_e006: macaddr@e006 {
+			reg = <0xe006 0x6>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-2533ghbk.dtsi

@@ -100,19 +100,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 				};
 			};
 		};

target/linux/ramips/dts/mt7621_elecom_wrc-2533gs2.dts

@@ -50,15 +50,17 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_fff4: macaddr@fff4 {
-		reg = <0xfff4 0x6>;
-	};
+		macaddr_factory_fff4: macaddr@fff4 {
+			reg = <0xfff4 0x6>;
+		};
 
-	macaddr_factory_fffa: macaddr@fffa {
-		reg = <0xfffa 0x6>;
+		macaddr_factory_fffa: macaddr@fffa {
+			reg = <0xfffa 0x6>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts

@@ -48,15 +48,17 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
+		macaddr_factory_e000: macaddr@e000 {
+			reg = <0xe000 0x6>;
+		};
 
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
+		macaddr_factory_e006: macaddr@e006 {
+			reg = <0xe006 0x6>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts

@@ -50,15 +50,17 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
+		macaddr_factory_e000: macaddr@e000 {
+			reg = <0xe000 0x6>;
+		};
 
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
+		macaddr_factory_e006: macaddr@e006 {
+			reg = <0xe006 0x6>;
+		};
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi

@@ -145,19 +145,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 				};
 			};
 		};

target/linux/ramips/dts/mt7621_etisalat_s3.dts

@@ -100,24 +100,27 @@
 		};
 
 		factory: partition@200000 {
-			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x200000 0x100000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			sercomm,scpart-id = <2>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x400>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x400>;
+				};
 
-			macaddr_factory_21000: macaddr@21000 {
-				reg = <0x21000 0x6>;
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
+
+				macaddr_factory_21000: macaddr@21000 {
+					reg = <0x21000 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_firefly_firewrt.dts

@@ -70,23 +70,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts

@@ -68,23 +68,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts

@@ -88,19 +88,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_4000: macaddr@4000 {
-					reg = <0x4000 0x6>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
+
+					macaddr_factory_4000: macaddr@4000 {
+						reg = <0x4000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts

@@ -75,6 +75,16 @@
 				label = "factory";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -125,13 +135,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts

@@ -95,6 +95,16 @@
 				label = "factory";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -151,13 +161,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi

@@ -97,15 +97,18 @@
 		};
 
 		factory: partition@180000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x0180000 0x0080000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0xe00>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0xe00>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_haier-sim_wr1800k.dtsi

@@ -103,19 +103,22 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x0100000 0x0080000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0xe00>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_8004: macaddr@8004 {
-				reg = <0x8004 0x6>;
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0xe00>;
+				};
+
+				macaddr_factory_8004: macaddr@8004 {
+					reg = <0x8004 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_hanyang_hyc-g920.dts

@@ -75,27 +75,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 
-				macaddr_factory_8004: macaddr@8004 {
-					reg = <0x8004 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
+
+					macaddr_factory_8004: macaddr@8004 {
+						reg = <0x8004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_hilink_hlk-7621a-evb.dts

@@ -47,15 +47,18 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts

@@ -81,19 +81,22 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x100000 0x40000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x400>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x200>;
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x400>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_huasifei_ws1208v2.dts

@@ -93,23 +93,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_humax_e10.dts

@@ -89,27 +89,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x30000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_10007: macaddr@10007 {
-					reg = <0x10007 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 
-				macaddr_factory_1000d: macaddr@1000d {
-					reg = <0x1000d 0x6>;
+					macaddr_factory_10007: macaddr@10007 {
+						reg = <0x10007 0x6>;
+					};
+
+					macaddr_factory_1000d: macaddr@1000d {
+						reg = <0x1000d 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts

@@ -89,36 +89,42 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 
 			iNIC_rf: partition@50000 {
-				compatible = "nvmem-cells";
 				label = "iNIC_rf";
 				reg = <0x50000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_iNIC_rf_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_iNIC_rf_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_iNIC_rf_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
+
+					macaddr_iNIC_rf_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_iodata_wn-deax1800gr.dts

@@ -119,7 +119,6 @@
 		};
 
 		partition@100000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x100000 0x80000>;
 			read-only;

target/linux/ramips/dts/mt7621_iodata_wn-dx1200gr.dts

@@ -81,26 +81,29 @@
 		};
 
 		factory: partition@200000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x200000 0x200000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x400>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x400>;
+				};
 
-			macaddr_factory_1e000: macaddr@1e000 {
-				reg = <0x1e000 0x6>;
-			};
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
 
-			macaddr_factory_1e006: macaddr@1e006 {
-				reg = <0x1e006 0x6>;
+				macaddr_factory_1e000: macaddr@1e000 {
+					reg = <0x1e000 0x6>;
+				};
+
+				macaddr_factory_1e006: macaddr@1e006 {
+					reg = <0x1e006 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts

@@ -89,19 +89,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi

@@ -80,6 +80,20 @@
 		factory: partition@200000 {
 			label = "factory";
 			reg = <0x0200000 0x0100000>;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_factory_e000: macaddr@e000 {
+					reg = <0xe000 0x6>;
+				};
+
+				macaddr_factory_e006: macaddr@e006 {
+					reg = <0xe006 0x6>;
+				};
+			};
 		};
 
 		partition@300000 {
@@ -180,17 +194,3 @@
 &xhci {
 	status = "disabled";
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts

@@ -93,23 +93,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x040000 0x010000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_iptime_a3002mesh.dts

@@ -73,12 +73,14 @@
 				reg = <0x0 0x20000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_uboot_1fc40: macaddr@1fc40 {
-					reg = <0x1fc40 0x6>;
+					macaddr_uboot_1fc40: macaddr@1fc40 {
+						reg = <0x1fc40 0x6>;
+					};
 				};
 			};
 
@@ -89,15 +91,18 @@
 			};
 
 			factory: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_iptime_a3004ns-dual.dts

@@ -63,19 +63,22 @@
 			#size-cells = <1>;
 
 			uboot: partition@0 {
-				compatible = "nvmem-cells";
 				label = "u-boot";
 				reg = <0x0 0x20000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				macaddr_uboot_1fc20: macaddr@1fc20 {
-					reg = <0x1fc20 0x6>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_uboot_1fc40: macaddr@1fc40 {
-					reg = <0x1fc40 0x6>;
+					macaddr_uboot_1fc20: macaddr@1fc20 {
+						reg = <0x1fc20 0x6>;
+					};
+
+					macaddr_uboot_1fc40: macaddr@1fc40 {
+						reg = <0x1fc40 0x6>;
+					};
 				};
 			};
 
@@ -86,19 +89,22 @@
 			};
 
 			factory: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_iptime_a3004t.dts

@@ -76,23 +76,26 @@
 		};
 
 		factory: partition@a0000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0xa0000 0x20000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x4da8>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_4: macaddr@4 {
-				reg = <0x4 0x6>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x4da8>;
+				};
 
-			macaddr_factory_8004: macaddr@8004 {
-				reg = <0x8004 0x6>;
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
+
+				macaddr_factory_8004: macaddr@8004 {
+					reg = <0x8004 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_iptime_a6004ns-m.dtsi

@@ -74,19 +74,22 @@
 			#size-cells = <1>;
 
 			uboot: partition@0 {
-				compatible = "nvmem-cells";
 				label = "u-boot";
 				reg = <0x0 0x20000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				macaddr_uboot_1fc20: macaddr@1fc20 {
-					reg = <0x1fc20 0x6>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_uboot_1fc40: macaddr@1fc40 {
-					reg = <0x1fc40 0x6>;
+					macaddr_uboot_1fc20: macaddr@1fc20 {
+						reg = <0x1fc20 0x6>;
+					};
+
+					macaddr_uboot_1fc40: macaddr@1fc40 {
+						reg = <0x1fc40 0x6>;
+					};
 				};
 			};
 
@@ -97,19 +100,22 @@
 			};
 
 			factory: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_iptime_a8004t.dts

@@ -68,19 +68,22 @@
 			#size-cells = <1>;
 
 			uboot: partition@0 {
-				compatible = "nvmem-cells";
 				label = "u-boot";
 				reg = <0x0 0x20000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				macaddr_uboot_1fc20: macaddr@1fc20 {
-					reg = <0x1fc20 0x6>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_uboot_1fc40: macaddr@1fc40 {
-					reg = <0x1fc40 0x6>;
+					macaddr_uboot_1fc20: macaddr@1fc20 {
+						reg = <0x1fc20 0x6>;
+					};
+
+					macaddr_uboot_1fc40: macaddr@1fc40 {
+						reg = <0x1fc40 0x6>;
+					};
 				};
 			};
 
@@ -91,19 +94,22 @@
 			};
 
 			factory: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_iptime_ax2004m.dts

@@ -77,12 +77,14 @@
 			reg = <0x100000 0x80000>;
 			read-only;
 
-			compatible = "nvmem-cells";
-			#address-cells = <1>;
-			#size-cells = <1>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_4: macaddr@4 {
-				reg = <0x4 0x6>;
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts

@@ -84,27 +84,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_jcg_q20.dts

@@ -88,23 +88,26 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x100000 0x80000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0xe00>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			macaddr_factory_3fff4: macaddr@3fff4 {
-				reg = <0x3fff4 0x6>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0xe00>;
+				};
 
-			macaddr_factory_3fffa: macaddr@3fffa {
-				reg = <0x3fffa 0x6>;
+				macaddr_factory_3fff4: macaddr@3fff4 {
+					reg = <0x3fff4 0x6>;
+				};
+
+				macaddr_factory_3fffa: macaddr@3fffa {
+					reg = <0x3fffa 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_jcg_y2.dts

@@ -62,23 +62,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x4da8>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x4da8>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_keenetic_kn-3010.dts

@@ -123,27 +123,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "rf-eeprom";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_400: eeprom@400 {
-					reg = <0x400 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
-				};
+					eeprom_factory_400: eeprom@400 {
+						reg = <0x400 0x4da8>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
+
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts

@@ -104,27 +104,30 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
-				};
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 
-				macaddr_factory_e006: macaddr@e006 {
-					reg = <0xe006 0x6>;
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
+
+					macaddr_factory_e006: macaddr@e006 {
+						reg = <0xe006 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_linksys_e5600.dts

@@ -83,19 +83,22 @@
 		};
 
 		factory: partition@c0000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0xc0000 0x40000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x400>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x4da8>;
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x400>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x4da8>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_linksys_e7350.dts

@@ -80,15 +80,18 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x100000 0x80000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0xe00>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0xe00>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_linksys_re6500.dts

@@ -71,23 +71,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_2e: macaddr@2e {
-					reg = <0x2e 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_2e: macaddr@2e {
+						reg = <0x2e 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_linksys_re7000.dts

@@ -84,23 +84,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x400>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x4da8>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
 
-				macaddr_factory_2e: macaddr@2e {
-					reg = <0x2e 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x4da8>;
+					};
+
+					macaddr_factory_2e: macaddr@2e {
+						reg = <0x2e 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts

@@ -97,6 +97,16 @@
 				label = "factory";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_5: macaddr@5 {
+						reg = <0x5 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -160,13 +170,3 @@
 &pcie {
 	status = "okay";
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_5: macaddr@5 {
-		reg = <0x5 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_meig_slt866.dts

@@ -117,7 +117,6 @@
 				label = "Factory";
 				reg = <0x40000 0x10000>;
 				read-only;
-				compatible = "nvmem-cells";
 
 				nvmem-layout {
 					compatible = "fixed-layout";
@@ -144,7 +143,6 @@
 				label = "m_custom";
 				reg = <0xfe0000 0x20000>;
 				read-only;
-				compatible = "nvmem-cells";
 
 				nvmem-layout {
 					compatible = "fixed-layout";

target/linux/ramips/dts/mt7621_mercusys_mr70x-v1.dts

@@ -75,6 +75,16 @@
 				label = "config";
 				reg = <0xfa0000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_config_8: macaddr@8 {
+						reg = <0x8 0x6>;
+					};
+				};
 			};
 
 			partition@fb0000 {
@@ -153,13 +163,3 @@
 		function = "gpio";
 	};
 };
-
-&config {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_config_8: macaddr@8 {
-		reg = <0x8 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_mqmaker_witi.dts

@@ -58,22 +58,25 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_e000: macaddr@e000 {
-					reg = <0xe000 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_e000: macaddr@e000 {
+						reg = <0xe000 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_mtc_wr1201.dts

@@ -78,23 +78,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_netgear_ex6150.dts

@@ -118,23 +118,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
-				};
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/mt7621_netgear_r6220.dts

@@ -42,7 +42,6 @@
 		};
 
 		factory: partition@2e00000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x2e00000 0x100000>;
 			read-only;

target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi

@@ -343,6 +343,16 @@
 			reg = <0x4600000 0x200000>;
 			sercomm,scpart-id = <16>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
+			};
 		};
 
 		partition@4800000 {
@@ -430,13 +440,3 @@
 		};
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_4: macaddr@4 {
-		reg = <0x4 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi

@@ -270,6 +270,16 @@
 			reg = <0x4600000 0x200000>;
 			sercomm,scpart-id = <16>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
+			};
 		};
 
 		partition@4800000 {
@@ -357,13 +367,3 @@
 		};
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_4: macaddr@4 {
-		reg = <0x4 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_netgear_wac104.dts

@@ -96,23 +96,26 @@
 		};
 
 		factory: partition@2e00000 {
-			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x2e00000 0x100000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0x400>;
-			};
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
 
-			eeprom_factory_8000: eeprom@8000 {
-				reg = <0x8000 0x200>;
-			};
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x400>;
+				};
 
-			macaddr_factory_4: macaddr@4 {
-				reg = <0x4 0x6>;
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
 			};
 		};
 

target/linux/ramips/dts/mt7621_netgear_wax202.dts

@@ -113,15 +113,18 @@
 		};
 
 		factory: partition@100000 {
-			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x100000 0x80000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
 			read-only;
 
-			eeprom_factory_0: eeprom@0 {
-				reg = <0x0 0xe00>;
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0xe00>;
+				};
 			};
 		};