ramips: convert MT7610 and MT7612 EEPROM to NVMEM format for MT7621

This patch converts MT7610 and MT7612 WiFi calibration data to NVMEM
format. The EEPROM size is 0x200.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>

target/linux/ramips/dts/mt7621_afoundry_ew1200.dts

@@ -82,6 +82,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -104,7 +108,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

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

@@ -147,6 +147,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_4: macaddr@4 {
 					reg = <0x4 0x6>;
 				};
@@ -201,7 +205,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

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

@@ -97,6 +97,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -123,7 +127,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 
 		led {
 			led-sources = <2>;

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

@@ -116,6 +116,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_4: macaddr@4 {
 					reg = <0x4 0x6>;
 				};
@@ -142,7 +146,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 	};
 };
 

target/linux/ramips/dts/mt7621_bolt_arion.dts

@@ -111,6 +111,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_28: macaddr@28 {
 					reg = <0x28 0x6>;
 				};
@@ -143,7 +147,8 @@
 	wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

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

@@ -143,6 +143,10 @@
 				eeprom_factory_0: eeprom@0 {
 					reg = <0x0 0x400>;
 				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
 			};
 
 			partition@50000 {
@@ -209,7 +213,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

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

@@ -95,6 +95,10 @@
 				eeprom_factory_0: eeprom@0 {
 					reg = <0x0 0x400>;
 				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
 			};
 
 			partition@50000 {
@@ -153,9 +157,8 @@
 	wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_bdinfo_de00>;
-		nvmem-cells = <&macaddr_bdinfo_de00>;
+		nvmem-cell-names = "eeprom", "mac-address";
-		nvmem-cell-names = "mac-address";
 		mac-address-increment = <2>;
 		ieee80211-freq-limit = <5000000 6000000>;
 

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

@@ -88,6 +88,10 @@
 				eeprom_factory_0: eeprom@0 {
 					reg = <0x0 0x400>;
 				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
 			};
 
 			partition@50000 {
@@ -141,9 +145,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_bdinfo_de00>;
-		nvmem-cells = <&macaddr_bdinfo_de00>;
+		nvmem-cell-names = "eeprom", "mac-address";
-		nvmem-cell-names = "mac-address";
 		mac-address-increment = <2>;
 	};
 };

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

@@ -126,6 +126,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -151,7 +155,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

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

@@ -140,6 +140,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -177,7 +181,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

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

@@ -83,9 +83,24 @@
 			};
 
 			radio: partition@34000 {
+				compatible = "nvmem-cells";
 				label = "radio";
 				reg = <0x34000 0x4000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
 				read-only;
+
+				macaddr_radio_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
+
+				eeprom_radio_0: eeprom@0 {
+					reg = <0x0 0x200>;
+				};
+
+				eeprom_radio_2000: eeprom@2000 {
+					reg = <0x2000 0x200>;
+				};
 			};
 
 			factory: partition@38000 {
@@ -163,7 +178,8 @@
 &pcie0 {
 	wifi0: mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&radio 0x2000>;
+		nvmem-cells = <&eeprom_radio_2000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -171,7 +187,8 @@
 &pcie1 {
 	wifi1: mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&radio 0x0>;
+		nvmem-cells = <&eeprom_radio_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };
@@ -182,13 +199,3 @@
 		function = "gpio";
 	};
 };
-
-&radio {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_radio_4: macaddr@4 {
-		reg = <0x4 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_firefly_firewrt.dts

@@ -70,9 +70,24 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_e000: macaddr@e000 {
+					reg = <0xe000 0x6>;
+				};
 			};
 
 			partition@50000 {
@@ -91,7 +106,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -99,7 +115,8 @@
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };
@@ -151,13 +168,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-};

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

@@ -79,6 +79,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -108,7 +112,8 @@
 &pcie1 {
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

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

@@ -75,9 +75,28 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
+
+				macaddr_factory_8004: macaddr@8004 {
+					reg = <0x8004 0x6>;
+				};
 			};
 
 			partition@50000 {
@@ -115,7 +134,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {
@@ -129,7 +149,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 
 		led {
@@ -182,17 +203,3 @@
 		function = "gpio";
 	};
 };
-	
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_4: macaddr@4 {
-		reg = <0x4 0x6>;
-	};
-
-	macaddr_factory_8004: macaddr@8004 {
-		reg = <0x8004 0x6>;
-	};
-};

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

@@ -47,9 +47,16 @@
 			};
 
 			factory: partition@40000 {
+				compatible = "nvmem-cells";
 				label = "factory";
 				reg = <0x40000 0x10000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
 				read-only;
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
 			};
 
 			partition@50000 {
@@ -105,7 +112,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 	};
 };
 

target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts

@@ -91,6 +91,10 @@
 			eeprom_factory_0: eeprom@0 {
 				reg = <0x0 0x400>;
 			};
+
+			eeprom_factory_8000: eeprom@8000 {
+				reg = <0x8000 0x200>;
+			};
 		};
 
 		partition@140000 {
@@ -132,7 +136,8 @@
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

target/linux/ramips/dts/mt7621_huasifei_ws1208v2.dts

@@ -104,6 +104,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -135,7 +139,8 @@
 	wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

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

@@ -96,6 +96,10 @@
 				#size-cells = <1>;
 				read-only;
 
+				eeprom_factory_0: eeprom@0 {
+					reg = <0x0 0x200>;
+				};
+
 				macaddr_factory_4: macaddr@4 {
 					reg = <0x4 0x6>;
 				};
@@ -212,7 +216,8 @@
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

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

@@ -63,9 +63,20 @@
 			#size-cells = <1>;
 
 			uboot: partition@0 {
+				compatible = "nvmem-cells";
 				label = "u-boot";
 				reg = <0x0 0x20000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
 				read-only;
+
+				macaddr_uboot_1fc20: macaddr@1fc20 {
+					reg = <0x1fc20 0x6>;
+				};
+
+				macaddr_uboot_1fc40: macaddr@1fc40 {
+					reg = <0x1fc40 0x6>;
+				};
 			};
 
 			partition@20000 {
@@ -75,9 +86,20 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
 			};
 
 			partition@40000 {
@@ -141,7 +163,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {
@@ -155,7 +178,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 
 		led {
@@ -171,17 +195,3 @@
 		function = "gpio";
 	};
 };
-
-&uboot {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_uboot_1fc20: macaddr@1fc20 {
-		reg = <0x1fc20 0x6>;
-	};
-
-	macaddr_uboot_1fc40: macaddr@1fc40 {
-		reg = <0x1fc40 0x6>;
-	};
-};

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

@@ -115,6 +115,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -140,7 +144,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

target/linux/ramips/dts/mt7621_linksys_re6500.dts

@@ -71,9 +71,24 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_2e: macaddr@2e {
+					reg = <0x2e 0x6>;
+				};
 			};
 
 			partition@50000 {
@@ -99,7 +114,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -107,7 +123,8 @@
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };
@@ -154,13 +171,3 @@
 &xhci {
 	status = "disabled";
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_2e: macaddr@2e {
-		reg = <0x2e 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_mqmaker_witi.dts

@@ -58,8 +58,23 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_e000: macaddr@e000 {
+					reg = <0xe000 0x6>;
+				};
 			};
 
 			partition@50000 {
@@ -78,20 +93,18 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&macaddr_factory_e000>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
 		ieee80211-freq-limit = <2400000 2500000>;
-		nvmem-cells = <&macaddr_factory_e000>;
+		nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 
@@ -156,13 +169,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_mtc_wr1201.dts

@@ -78,9 +78,24 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
 			};
 
 			partition@50000 {
@@ -150,8 +165,9 @@
 &pcie0 {
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 
 		led {
 			led-sources = <2>;
@@ -163,8 +179,9 @@
 &pcie1 {
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
 		ieee80211-freq-limit = <2400000 2500000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 
 		led {
 			led-sources = <2>;
@@ -179,13 +196,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_4: macaddr@4 {
-		reg = <0x4 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_netgear_ex6150.dts

@@ -118,9 +118,24 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_4: macaddr@4 {
+					reg = <0x4 0x6>;
+				};
 			};
 
 			partition@50000 {
@@ -214,7 +229,8 @@
 &pcie0 {
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -222,7 +238,8 @@
 &pcie1 {
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };
@@ -251,13 +268,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_4: macaddr@4 {
-		reg = <0x4 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_netgear_wac104.dts

@@ -107,6 +107,10 @@
 				reg = <0x0 0x400>;
 			};
 
+			eeprom_factory_8000: eeprom@8000 {
+				reg = <0x8000 0x200>;
+			};
+
 			macaddr_factory_4: macaddr@4 {
 				reg = <0x4 0x6>;
 			};
@@ -128,7 +132,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

target/linux/ramips/dts/mt7621_netis_wf2881.dts

@@ -63,9 +63,28 @@
 		};
 
 		factory: partition@100000 {
+			compatible = "nvmem-cells";
 			label = "factory";
 			reg = <0x100000 0x40000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
 			read-only;
+
+			eeprom_factory_0: eeprom@0 {
+				reg = <0x0 0x200>;
+			};
+
+			eeprom_factory_8000: eeprom@8000 {
+				reg = <0x8000 0x200>;
+			};
+
+			macaddr_factory_e000: macaddr@e000 {
+				reg = <0xe000 0x6>;
+			};
+
+			macaddr_factory_e006: macaddr@e006 {
+				reg = <0xe006 0x6>;
+			};
 		};
 
 		partition@140000 {
@@ -97,7 +116,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {
@@ -111,7 +131,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 
 		led {
@@ -171,17 +192,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts

@@ -83,6 +83,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -108,7 +112,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

target/linux/ramips/dts/mt7621_sercomm_na502.dts

@@ -135,6 +135,10 @@
 				reg = <0x0 0x400>;
 			};
 
+			eeprom_factory_8000: eeprom@8000 {
+				reg = <0x8000 0x200>;
+			};
+
 			macaddr_factory_e000: macaddr@e000 {
 				reg = <0xe000 0x6>;
 			};
@@ -185,9 +189,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000>;
-		nvmem-cells = <&macaddr_factory_e000>;
+		nvmem-cell-names = "eeprom", "mac-address";
-		nvmem-cell-names = "mac-address";
 		mac-address-increment = <1>;
 		ieee80211-freq-limit = <5000000 6000000>;
 	};

target/linux/ramips/dts/mt7621_sercomm_na502s.dts

@@ -239,6 +239,10 @@
 				reg = <0x0 0x400>;
 			};
 
+			eeprom_factory_8000: eeprom@8000 {
+				reg = <0x8000 0x200>;
+			};
+
 			macaddr_factory_e000: macaddr@e000 {
 				reg = <0xe000 0x6>;
 			};
@@ -289,9 +293,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000>;
-		nvmem-cells = <&macaddr_factory_e000>;
+		nvmem-cell-names = "eeprom", "mac-address";
-		nvmem-cell-names = "mac-address";
 		mac-address-increment = <1>;
 		ieee80211-freq-limit = <5000000 6000000>;
 	};

target/linux/ramips/dts/mt7621_sercomm_s1500.dtsi

@@ -177,13 +177,20 @@
 		};
 
 		factory: partition@100000 {
+			compatible = "nvmem-cells";
 			label = "Factory";
 			reg = <0x100000 0x100000>;
-			read-only;
-
-			compatible = "nvmem-cells";
 			#address-cells = <1>;
 			#size-cells = <1>;
+			read-only;
+
+			eeprom_factory_0: eeprom@0 {
+				reg = <0x0 0x200>;
+			};
+
+			eeprom_factory_8000: eeprom@8000 {
+				reg = <0x8000 0x200>;
+			};
 
 			macaddr_factory_1000: macaddr@1000 {
 				reg = <0x1000 0x6>;
@@ -220,10 +227,9 @@
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
 
-		nvmem-cells = <&macaddr_factory_1000>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_1000>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cell-names = "eeprom", "mac-address";
 		mac-address-increment = <2>;
 	};
 };
@@ -233,10 +239,9 @@
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <2400000 2500000>;
-		mediatek,mtd-eeprom = <&factory 0x0>;
 
-		nvmem-cells = <&macaddr_factory_1000>;
+		nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_1000>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };
 

target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts

@@ -114,7 +114,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -156,6 +157,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};

target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts

@@ -67,9 +67,24 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_e006: macaddr@e006 {
+					reg = <0xe006 0x6>;
+				};
 			};
 
 			partition@50000 {
@@ -88,7 +103,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -96,7 +112,8 @@
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };
@@ -152,13 +169,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e006: macaddr@e006 {
-		reg = <0xe006 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_telco-electronics_x1.dts

@@ -117,6 +117,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e006: macaddr@e006 {
 					reg = <0xe006 0x6>;
 				};
@@ -197,7 +201,8 @@
 	wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

target/linux/ramips/dts/mt7621_tozed_zlt-s12-pro.dts

@@ -171,6 +171,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -193,7 +197,8 @@
 	wifi0: mt76@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

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

@@ -131,6 +131,10 @@
 				eeprom_radio_0: eeprom@0 {
 					reg = <0x0 0x400>;
 				};
+
+				eeprom_radio_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
 			};
 		};
 	};
@@ -152,10 +156,9 @@
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&radio 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&macaddr_config_10008>;
+		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cell-names = "eeprom", "mac-address";
 		mac-address-increment = <2>;
 	};
 };

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

@@ -44,6 +44,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};

target/linux/ramips/dts/mt7621_unielec_u7621-01.dtsi

@@ -64,7 +64,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi

@@ -74,6 +74,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_2e: macaddr@2e {
 					reg = <0x2e 0x6>;
 				};
@@ -114,7 +118,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

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

@@ -124,6 +124,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -159,7 +163,8 @@
 	wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };

target/linux/ramips/dts/mt7621_youhua_wr1200js.dts

@@ -97,6 +97,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -130,7 +134,8 @@
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

target/linux/ramips/dts/mt7621_youku_yk-l2.dts

@@ -100,6 +100,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -140,7 +144,8 @@
 	wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 		led {
 			led-sources = <2>;

target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts

@@ -70,6 +70,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -140,7 +144,8 @@
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts

@@ -67,6 +67,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -93,7 +97,8 @@
 	wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602-v04.dtsi

@@ -122,6 +122,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -156,7 +160,8 @@
 	wifi1: wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi

@@ -121,6 +121,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -155,7 +159,8 @@
 	wifi1: wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {

target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts

@@ -72,9 +72,24 @@
 			};
 
 			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>;
+				};
+
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
+				macaddr_factory_e000: macaddr@e000 {
+					reg = <0xe000 0x6>;
+				};
 			};
 
 			partition@50000 {
@@ -96,7 +111,8 @@
 &pcie0 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
@@ -104,7 +120,8 @@
 &pcie1 {
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
+		nvmem-cells = <&eeprom_factory_0>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };
@@ -156,13 +173,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_e000: macaddr@e000 {
-		reg = <0xe000 0x6>;
-	};
-};

target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi

@@ -83,6 +83,10 @@
 					reg = <0x0 0x400>;
 				};
 
+				eeprom_factory_8000: eeprom@8000 {
+					reg = <0x8000 0x200>;
+				};
+
 				macaddr_factory_e000: macaddr@e000 {
 					reg = <0xe000 0x6>;
 				};
@@ -113,7 +117,8 @@
 	wifi1: wifi@0,0 {
 		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
+		nvmem-cells = <&eeprom_factory_8000>;
+		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {