ramips: rtxxxx: convert to nvmem-layout

Allows replacing mac-adress-increment.

Signed-off-by: Rosen Penev <[email protected]>

target/linux/ramips/dts/rt2880_airlink101_ar670w.dts

@@ -31,19 +31,22 @@
 			};
 
 			factory: partition@30000 {
-				compatible = "nvmem-cells";
-				label = "factory";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+				label = "factory";
 				read-only;
 
-				eeprom_factory_2000: eeprom@2000 {
-					reg = <0x2000 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_2000: eeprom@2000 {
+						reg = <0x2000 0x200>;
+					};
 
-				macaddr_factory_2004: macaddr@2004 {
-					reg = <0x2004 0x6>;
+					macaddr_factory_2004: macaddr@2004 {
+						reg = <0x2004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt2880_airlink101_ar725w.dts

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

target/linux/ramips/dts/rt2880_asus_rt-n15.dts

@@ -40,19 +40,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

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

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts

@@ -40,19 +40,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts

@@ -40,19 +40,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts

@@ -32,19 +32,22 @@
 			};
 
 			factory: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_factory_2000: eeprom@2000 {
-					reg = <0x2000 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_2000: eeprom@2000 {
+						reg = <0x2000 0x200>;
+					};
 
-				macaddr_factory_2004: macaddr@2004 {
-					reg = <0x2004 0x6>;
+					macaddr_factory_2004: macaddr@2004 {
+						reg = <0x2004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts

@@ -37,15 +37,18 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
-				label = "factory";
 				reg = <0x00040000 0x00010000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+				label = "factory";
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_8devices_carambola.dts

@@ -35,19 +35,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi

@@ -63,19 +63,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_alphanetworks_asl26555-16m.dts

@@ -55,19 +55,22 @@
 			};
 
 			devdata: partition@ff0000 {
-				compatible = "nvmem-cells";
 				label = "devdata";
 				reg = <0xff0000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devdata_4000: eeprom@4000 {
-					reg = <0x4000 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devdata_4000: eeprom@4000 {
+						reg = <0x4000 0x200>;
+					};
 
-				macaddr_devdata_4004: macaddr@4004 {
-					reg = <0x4004 0x6>;
+					macaddr_devdata_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
 				};
 			};
 		};

target/linux/ramips/dts/rt3050_alphanetworks_asl26555-8m.dts

@@ -25,19 +25,22 @@
 			};
 
 			devdata: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "uboot-env";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devdata_4000: eeprom@4000 {
-					reg = <0x4000 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devdata_4000: eeprom@4000 {
+						reg = <0x4000 0x200>;
+					};
 
-				macaddr_devdata_4004: macaddr@4004 {
-					reg = <0x4004 0x6>;
+					macaddr_devdata_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts

@@ -35,19 +35,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts

@@ -51,19 +51,22 @@
 			};
 
 			devconf: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "devconf";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devconf_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devconf_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_devconf_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_devconf_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts

@@ -38,19 +38,22 @@
 			};
 
 			devconf: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "devconf";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devconf_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devconf_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_devconf_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_devconf_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_asus_wl-330n.dts

@@ -72,19 +72,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts

@@ -77,19 +77,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_dlink_dcs-930.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts

@@ -32,19 +32,22 @@
 			};
 
 			devdata: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "devdata";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devdata_4000: eeprom@4000 {
-					reg = <0x4000 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devdata_4000: eeprom@4000 {
+						reg = <0x4000 0x200>;
+					};
 
-				macaddr_devdata_4004: macaddr@4004 {
-					reg = <0x4004 0x6>;
+					macaddr_devdata_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts

@@ -32,19 +32,22 @@
 			};
 
 			devdata: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "devdata";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devdata_4000: eeprom@4000 {
-					reg = <0x4000 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devdata_4000: eeprom@4000 {
+						reg = <0x4000 0x200>;
+					};
 
-				macaddr_devdata_4004: macaddr@4004 {
-					reg = <0x4004 0x6>;
+					macaddr_devdata_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts

@@ -33,15 +33,18 @@
 			};
 
 			devdata: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "devdata";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devdata_4000: eeprom@4000 {
-					reg = <0x4000 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devdata_4000: eeprom@4000 {
+						reg = <0x4000 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts

@@ -39,19 +39,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts

@@ -39,19 +39,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_huawei_d105.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts

@@ -68,19 +68,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_2e: macaddr@2e {
-					reg = <0x2e 0x6>;
+					macaddr_factory_2e: macaddr@2e {
+						reg = <0x2e 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_netcore_nw718.dts

@@ -79,19 +79,22 @@
 			};
 
 			factory: partition@50000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x50000 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_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts

@@ -70,19 +70,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_tenda_w150m.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_accton_wr6202.dts

@@ -66,19 +66,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_alfa-network_w502u.dts

@@ -42,19 +42,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_argus_atp-52b.dts

@@ -37,18 +37,21 @@
 			};
 
 			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_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts

@@ -61,15 +61,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 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_asus_rt-n13u.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

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

@@ -26,19 +26,22 @@
 			#size-cells = <1>;
 
 			uboot: partition@0 {
-				compatible = "nvmem-cells";
 				label = "uboot";
 				reg = <0x0 0x50000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_uboot_40000: eeprom@40000 {
-					reg = <0x40000 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_uboot_40000: eeprom@40000 {
+						reg = <0x40000 0x200>;
+					};
 
-				macaddr_uboot_40004: macaddr@40004 {
-					reg = <0x40004 0x6>;
+					macaddr_uboot_40004: macaddr@40004 {
+						reg = <0x40004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts

@@ -37,19 +37,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_dlink_dap-1350.dts

@@ -36,19 +36,22 @@
 			};
 
 			devdata: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "devdata";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devdata_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devdata_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_devdata_2e: macaddr@2e {
-					reg = <0x2e 0x6>;
+					macaddr_devdata_2e: macaddr@2e {
+						reg = <0x2e 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_engenius_esr-9753.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_fon_fonera-20n.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_hauppauge_broadway.dts

@@ -31,19 +31,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_huawei_hg255d.dts

@@ -38,19 +38,22 @@
 			};
 
 			factory: partition@60000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x60000 0x20000>;
-				#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_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_2e: macaddr@2e {
-					reg = <0x2e 0x6>;
+					macaddr_factory_2e: macaddr@2e {
+						reg = <0x2e 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_2e: macaddr@2e {
-					reg = <0x2e 0x6>;
+					macaddr_factory_2e: macaddr@2e {
+						reg = <0x2e 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts

@@ -38,15 +38,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 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_netgear_wnce2001.dts

@@ -92,19 +92,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_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_nexaira_bc2.dts

@@ -31,19 +31,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts

@@ -63,19 +63,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_petatel_psr-680w.dts

@@ -42,19 +42,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts

@@ -35,19 +35,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_poray_ip2202.dts

@@ -41,6 +41,16 @@
 				label = "factory";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -96,13 +106,3 @@
 &otg {
 	status = "okay";
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_28: macaddr@28 {
-		reg = <0x28 0x6>;
-	};
-};

target/linux/ramips/dts/rt3052_prolink_pwh2004.dts

@@ -38,15 +38,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 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts

@@ -38,15 +38,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 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_sitecom_wl-351.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_tenda_3g300m.dts

@@ -94,19 +94,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

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

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_unbranded_wr512-3gn-4m.dts

@@ -28,15 +28,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 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_unbranded_wr512-3gn-8m.dts

@@ -28,15 +28,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 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4004: macaddr@4004 {
-					reg = <0x4004 0x6>;
+					macaddr_factory_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_upvel_ur-336un.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4004: macaddr@4004 {
-					reg = <0x4004 0x6>;
+					macaddr_factory_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_zyxel_keenetic.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts

@@ -38,19 +38,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3352_allnet_all5002.dts

@@ -69,19 +69,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3352_dlink_dir-615-h1.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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts

@@ -66,19 +66,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3352_zte_mf283plus.dts

@@ -85,19 +85,22 @@
 			};
 
 			factory: partition@70000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x70000 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_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts

@@ -83,19 +83,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3662_asus_rt-n56u.dts

@@ -37,23 +37,26 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
-				label = "factory";
 				reg = <0x00040000 0x00010000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+				label = "factory";
 				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>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3662_dlink_dir-645.dts

@@ -94,19 +94,22 @@
 			};
 
 			factory: partition@34000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x34000 0x4000>;
-				#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_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts

@@ -75,32 +75,38 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x00040000 0x00010000>;
-				#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_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 				};
 			};
 
 			devdata: partition@50000 {
-				compatible = "nvmem-cells";
 				label = "devdata";
 				reg = <0x00050000 0x00020000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				macaddr_devdata_d: macaddr@d {
-					reg = <0xd 0x6>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_devdata_d: macaddr@d {
+						reg = <0xd 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3662_engenius_esr600h.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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3662_loewe_wmdr-143n.dts

@@ -31,15 +31,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 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3662_omnima_hpm.dts

@@ -110,19 +110,22 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
-				label = "factory";
 				reg = <0x00040000 0x00010000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+				label = "factory";
 				read-only;
 
-				eeprom_factory_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts

@@ -37,19 +37,22 @@
 			};
 
 			factory: partition@34000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x34000 0x4000>;
-				#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_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				eeprom_factory_2000: eeprom@2000 {
-					reg = <0x2000 0x200>;
+					eeprom_factory_2000: eeprom@2000 {
+						reg = <0x2000 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi

@@ -42,19 +42,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				eeprom_factory_8000: eeprom@8000 {
-					reg = <0x8000 0x200>;
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts

@@ -122,23 +122,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>;
+					};
+
+					eeprom_factory_8000: eeprom@8000 {
+						reg = <0x8000 0x200>;
+					};
 
-				macaddr_factory_8004: macaddr@8004 {
-					reg = <0x8004 0x6>;
+					macaddr_factory_8004: macaddr@8004 {
+						reg = <0x8004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts

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

target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts

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

target/linux/ramips/dts/rt5350_7links_px-4885.dtsi

@@ -67,19 +67,22 @@
 			};
 
 			devconf: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "devconf";
 				reg = <0x40000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devconf_0: eeprom@0 {
-					reg = <0x0 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devconf_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_devconf_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_devconf_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_airlive_air3gii.dts

@@ -61,19 +61,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_allnet_all5003.dts

@@ -69,19 +69,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi

@@ -69,19 +69,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_belkin_f7c027.dts

@@ -88,15 +88,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 0x200>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts

@@ -72,19 +72,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts

@@ -72,19 +72,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts

@@ -94,19 +94,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts

@@ -66,19 +66,22 @@
 			};
 
 			devdata: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "devdata";
 				reg = <0x30000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 				read-only;
 
-				eeprom_devdata_4000: eeprom@4000 {
-					reg = <0x4000 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_devdata_4000: eeprom@4000 {
+						reg = <0x4000 0x200>;
+					};
 
-				macaddr_devdata_4004: macaddr@4004 {
-					reg = <0x4004 0x6>;
+					macaddr_devdata_4004: macaddr@4004 {
+						reg = <0x4004 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts

@@ -103,18 +103,21 @@
 			};
 
 			config: partition@7f0000 {
-				compatible = "nvmem-cells";
 				label = "config";
 				reg = <0x7f0000 0x10000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
 
-				macaddr_config_e07e: macaddr@e07e {
-					reg = <0xe07e 0x6>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_config_e07e: macaddr@e07e {
+						reg = <0xe07e 0x6>;
+					};
 
-				eeprom_config_e08a: eeprom@e08a {
-					reg = <0xe08a 0x200>;
+					eeprom_config_e08a: eeprom@e08a {
+						reg = <0xe08a 0x200>;
+					};
 				};
 			};
 		};

target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts

@@ -31,19 +31,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_hame_mpr-a1.dts

@@ -83,19 +83,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_hame_mpr-a2.dts

@@ -83,19 +83,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts

@@ -76,19 +76,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_4: macaddr@4 {
-					reg = <0x4 0x6>;
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts

@@ -73,19 +73,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};
 

target/linux/ramips/dts/rt5350_intenso_memory2move.dts

@@ -76,19 +76,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 0x200>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x200>;
+					};
 
-				macaddr_factory_28: macaddr@28 {
-					reg = <0x28 0x6>;
+					macaddr_factory_28: macaddr@28 {
+						reg = <0x28 0x6>;
+					};
 				};
 			};