ramips: mt7628: use nvmem-layout

Will allow using mac-base.

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

target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts

@@ -114,12 +114,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -129,6 +131,7 @@
 						reg = <0x2e 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_asus_rt-ac1200.dtsi

@@ -73,12 +73,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -92,6 +94,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi

@@ -75,12 +75,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -90,6 +92,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts

@@ -141,12 +141,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -156,6 +158,7 @@
 						reg = <0x8000 0x200>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "brcm,trx";

target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts

@@ -70,12 +70,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -93,6 +95,7 @@
 						reg = <0xe000 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_comfast_cf-wr758ac.dtsi

@@ -85,12 +85,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -104,6 +106,7 @@
 						reg = <0xe000 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_cudy_wr1000.dts

@@ -89,12 +89,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -108,6 +110,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts

@@ -116,6 +116,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 {
@@ -160,13 +170,3 @@
 	status = "okay";
 	mediatek,cd-high;
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_28: macaddr@28 {
-		reg = <0x28 0x6>;
-	};
-};

target/linux/ramips/dts/mt7628an_dlink_dap-1325-a1.dts

@@ -115,12 +115,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -130,6 +132,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_duzun_dm06.dts

@@ -120,6 +120,16 @@
 				label = "factory";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_factory_4: macaddr@4 {
+						reg = <0x4 0x6>;
+					};
+				};
 			};
 
 			partition@50000 {
@@ -130,13 +140,3 @@
 		};
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_4: macaddr@4 {
-		reg = <0x4 0x6>;
-	};
-};

target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts

@@ -102,12 +102,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -121,6 +123,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts

@@ -118,12 +118,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -133,6 +135,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi

@@ -90,12 +90,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -105,6 +107,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			/*
 			 * Firmware-partition size is model-specific

target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts

@@ -101,12 +101,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -116,6 +118,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts

@@ -67,12 +67,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -82,6 +84,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts

@@ -81,12 +81,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -96,6 +98,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi

@@ -57,12 +57,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -80,6 +82,7 @@
 						reg = <0x2e 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_iptime.dtsi

@@ -43,17 +43,20 @@
 			#size-cells = <1>;
 
 			uboot: partition@0 {
-				compatible = "nvmem-cells";
 				label = "u-boot";
 				reg = <0x0 0x20000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					macaddr_uboot_1fc20: macaddr@1fc20 {
 						reg = <0x1fc20 0x6>;
 					};
 				};
+			};
 
 			partition@20000 {
 				label = "config";
@@ -62,12 +65,14 @@
 			};
 
 			factory: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x30000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -77,6 +82,7 @@
 						reg = <0x8000 0x200>;
 					};
 				};
+			};
 
 			partition@40000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi

@@ -81,12 +81,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -96,6 +98,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			firmware: partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts

@@ -130,12 +130,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "rf-eeprom";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -149,6 +151,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			firmware1: partition@50000 {
 				label = "firmware_1";

target/linux/ramips/dts/mt7628an_kroks.dtsi

@@ -65,9 +65,11 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
 
@@ -79,6 +81,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_linksys_e5400.dts

@@ -78,12 +78,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -97,6 +99,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts

@@ -108,12 +108,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -123,6 +125,7 @@
 						reg = <0x2e 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts

@@ -38,17 +38,20 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

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

@@ -43,12 +43,14 @@
 			};
 
 			factory: partition@1d800 {
-				compatible = "nvmem-cells";
 				label = "factory_info";
 				reg = <0x1d800 0x800>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -58,19 +60,23 @@
 						reg = <0xd 0x6>;
 					};
 				};
+			};
 
 			art: partition@1e000 {
-				compatible = "nvmem-cells";
 				label = "art";
 				reg = <0x1e000 0x2000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_art_1000: eeprom@1000 {
 						reg = <0x1000 0x200>;
 					};
 				};
+			};
 
 			partition@20000 {
 				label = "config";

target/linux/ramips/dts/mt7628an_minew_g1-c.dts

@@ -105,12 +105,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -120,6 +122,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_motorola_mwr03.dts

@@ -68,12 +68,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -87,6 +89,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi

@@ -80,12 +80,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x20000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -99,6 +101,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@60000 {
 				label = "nvram";

target/linux/ramips/dts/mt7628an_onion_omega2.dtsi

@@ -118,12 +118,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -133,6 +135,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			firmware: partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_oraybox_x1.dts

@@ -91,6 +91,16 @@
 				label = "bdinfo";
 				reg = <0xfe0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_bdinfo_9: macaddr@9 {
+						reg = <0x9 0x6>;
+					};
+				};
 			};
 
 			partition@ff0000 {
@@ -117,13 +127,3 @@
 &wmac {
 	status = "okay";
 };
-
-&bdinfo {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_bdinfo_9: macaddr@9 {
-		reg = <0x9 0x6>;
-	};
-};

target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts

@@ -52,12 +52,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -67,6 +69,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts

@@ -138,12 +138,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -157,6 +159,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				label = "loader";

target/linux/ramips/dts/mt7628an_skylab_skw92a.dts

@@ -84,12 +84,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -99,6 +101,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				label = "firmware";

target/linux/ramips/dts/mt7628an_tama_w06.dts

@@ -75,12 +75,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -90,6 +92,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_totolink_lr1200.dts

@@ -144,12 +144,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -163,6 +165,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi

@@ -53,17 +53,20 @@
 			};
 
 			rom: partition@7d0000 {
-				compatible = "nvmem-cells";
 				label = "rom";
 				reg = <0x7d0000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					macaddr_rom_f100: macaddr@f100 {
 						reg = <0xf100 0x6>;
 					};
 				};
+			};
 
 			partition@7e0000 {
 				label = "romfile";
@@ -71,12 +74,14 @@
 			};
 
 			radio: partition@7f0000 {
-				compatible = "nvmem-cells";
 				label = "radio";
 				reg = <0x7f0000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_radio_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -88,6 +93,7 @@
 				};
 			};
 		};
+	};
 };
 
 &wmac {

target/linux/ramips/dts/mt7628an_tplink_8m.dtsi

@@ -45,12 +45,14 @@
 			};
 
 			factory: partition@7d0000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x7d0000 0x30000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					macaddr_factory_f100: macaddr@f100 {
 						reg = <0xf100 0x6>;
@@ -66,6 +68,7 @@
 				};
 			};
 		};
+	};
 };
 
 &wmac {

target/linux/ramips/dts/mt7628an_tplink_re200.dtsi

@@ -96,25 +96,30 @@
 			};
 
 			config: partition@7c0000 {
-				compatible = "nvmem-cells";
 				label = "config";
 				reg = <0x7c0000 0x30000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					macaddr_config_2008: macaddr@2008 {
 						reg = <0x2008 0x6>;
 					};
 				};
+			};
 
 			radio: partition@7f0000 {
-				compatible = "nvmem-cells";
 				label = "radio";
 				reg = <0x7f0000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_radio_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -126,6 +131,7 @@
 				};
 			};
 		};
+	};
 };
 
 &state_default {

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

@@ -33,17 +33,20 @@
 			};
 
 			config: partition@600000 {
-				compatible = "nvmem-cells";
 				label = "config";
 				reg = <0x600000 0x50000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					macaddr_config_10008: macaddr@10008 {
 						reg = <0x10008 0x6>;
 					};
 				};
+			};
 
 			/*
 				The flash space between 0x650000 and 0x7f0000 is blank in the
@@ -51,12 +54,14 @@
 			*/
 
 			radio: partition@7f0000 {
-				compatible = "nvmem-cells";
 				label = "radio";
 				reg = <0x7f0000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_radio_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -68,6 +73,7 @@
 				};
 			};
 		};
+	};
 };
 
 &wlan5g {

target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts

@@ -33,25 +33,30 @@
 			};
 
 			config: partition@7c0000 {
-				compatible = "nvmem-cells";
 				label = "config";
 				reg = <0x7c0000 0x30000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					macaddr_config_2008: macaddr@2008 {
 						reg = <0x2008 0x6>;
 					};
 				};
+			};
 
 			radio: partition@7f0000 {
-				compatible = "nvmem-cells";
 				label = "radio";
 				reg = <0x7f0000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_radio_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -63,6 +68,7 @@
 				};
 			};
 		};
+	};
 };
 
 &wlan5g {

target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts

@@ -121,12 +121,14 @@
 			};
 
 			factory: partition@7d0000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x7d0000 0x30000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_20000: eeprom@20000 {
 						reg = <0x20000 0x400>;
@@ -138,6 +140,7 @@
 				};
 			};
 		};
+	};
 };
 
 &state_default {

target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts

@@ -93,11 +93,13 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
+	nvmem-layout {
+		compatible = "fixed-layout";
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		macaddr_factory_1f100: macaddr@1f100 {
 			reg = <0x1f100 0x6>;
 		};
+	};
 };

target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts

@@ -93,11 +93,13 @@
 };
 
 &factory {
-	compatible = "nvmem-cells";
+	nvmem-layout {
+		compatible = "fixed-layout";
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		macaddr_factory_1f100: macaddr@1f100 {
 			reg = <0x1f100 0x6>;
 		};
+	};
 };

target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts

@@ -70,12 +70,14 @@
 			};
 
 			factory: partition@3f0000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x3f0000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -87,6 +89,7 @@
 				};
 			};
 		};
+	};
 };
 
 &ehci {

target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts

@@ -81,12 +81,14 @@
 			};
 
 			factory: partition@3f0000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x3f0000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -98,6 +100,7 @@
 				};
 			};
 		};
+	};
 };
 
 &ehci {

target/linux/ramips/dts/mt7628an_unielec_u7628-01-16m.dts

@@ -38,12 +38,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -53,6 +55,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi

@@ -40,12 +40,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -55,6 +57,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			firmware: partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_wavlink_wl-wn531a3.dts

@@ -109,12 +109,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -128,6 +130,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts

@@ -99,12 +99,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -118,6 +120,7 @@
 						reg = <0x2e 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts

@@ -94,12 +94,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -113,6 +115,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_wavlink_wl-wn576a2.dts

@@ -133,12 +133,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -152,6 +154,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts

@@ -98,12 +98,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -117,6 +119,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts

@@ -128,12 +128,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -147,6 +149,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_widora_neo.dtsi

@@ -74,12 +74,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -89,6 +91,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			firmware: partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts

@@ -117,12 +117,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -132,6 +134,7 @@
 						reg = <0x2e 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi

@@ -48,12 +48,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -63,6 +65,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi

@@ -47,12 +47,14 @@
 			};
 
 			factory: partition@30000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x30000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -74,6 +76,7 @@
 						reg = <0x8004 0x6>;
 					};
 				};
+			};
 
 			partition@40000 {
 				label = "crash";

target/linux/ramips/dts/mt7628an_xiaomi_miwifi-3c.dts

@@ -114,12 +114,14 @@
 			};
 
 			factory: partition@50000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x50000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -129,6 +131,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@60000 {
 				label = "crash";

target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts

@@ -106,12 +106,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -121,6 +123,7 @@
 						reg = <0x28 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts

@@ -86,12 +86,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -101,6 +103,7 @@
 						reg = <0x2e 0x6>;
 					};
 				};
+			};
 
 			partition@50000 {
 				compatible = "denx,uimage";

target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts

@@ -121,12 +121,14 @@
 			};
 
 			factory: partition@40000 {
-				compatible = "nvmem-cells";
 				label = "rf-eeprom";
 				reg = <0x40000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
-				read-only;
 
 					eeprom_factory_0: eeprom@0 {
 						reg = <0x0 0x400>;
@@ -140,6 +142,7 @@
 						reg = <0x4 0x6>;
 					};
 				};
+			};
 
 			firmware1: partition@50000 {
 				label = "firmware_1";