ramips: mt7628: use mac-base

mac-address-increment is deprecated.

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

26 files changed, 115 insertions, 55 deletions

diff --git a/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts b/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
index 19c220cabb5..1d6304cfa77 100644
--- a/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
+++ b/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
@@ -88,7 +88,9 @@
 					};
 
 					macaddr_factory_8004: macaddr@8004 {
+						compatible = "mac-base";
 						reg = <0x8004 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 
 					macaddr_factory_e000: macaddr@e000 {
@@ -115,9 +117,8 @@
 		compatible = "mediatek,mt76";
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004 2>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <2>;
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_linksys_e5400.dts b/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
index 183b5c3cd14..26ff86dac2d 100644
--- a/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
+++ b/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
@@ -96,7 +96,9 @@
 					};
 
 					macaddr_factory_28: macaddr@28 {
+						compatible = "mac-base";
 						reg = <0x28 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -126,7 +128,7 @@
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_factory_28>;
+	nvmem-cells = <&macaddr_factory_28 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -144,9 +146,8 @@
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
 
-		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28>;
+		nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28 3>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <3>;
 	};
 };
 
@@ -164,8 +165,7 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28>;
+	nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28 2>;
 	nvmem-cell-names = "eeprom", "mac-address";
-	mac-address-increment = <2>;
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts b/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
index 003bd9f544c..ebaa4326aea 100644
--- a/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
+++ b/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
@@ -86,7 +86,9 @@
 					};
 
 					macaddr_factory_4: macaddr@4 {
+						compatible = "mac-base";
 						reg = <0x4 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -120,9 +122,8 @@
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 (-1)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-1)>;
 };
 
 &esw {
diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
index e9fc6d7090f..e3ee55873e9 100644
--- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
@@ -44,7 +44,6 @@
 };
 
 &wifi5 {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 2>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(2)>;
 };
diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
index 6a3b654e080..98d132e891f 100644
--- a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
@@ -98,7 +98,9 @@
 					};
 
 					macaddr_factory_4: macaddr@4 {
+						compatible = "mac-base";
 						reg = <0x4 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -120,7 +122,7 @@
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 0>;
 	nvmem-cell-names = "mac-address";
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
index fee3935fdfa..a5c9267c8d7 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
@@ -63,7 +63,9 @@
 					#size-cells = <1>;
 
 					macaddr_rom_f100: macaddr@f100 {
+						compatible = "mac-base";
 						reg = <0xf100 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -99,12 +101,12 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&eeprom_radio_0>, <&macaddr_rom_f100>;
+	nvmem-cells = <&eeprom_radio_0>, <&macaddr_rom_f100 0>;
 	nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_rom_f100>;
+	nvmem-cells = <&macaddr_rom_f100 0>;
 	nvmem-cell-names = "mac-address";
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
index 90ccebe723e..3db4bb9b9c2 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
@@ -55,7 +55,9 @@
 					#size-cells = <1>;
 
 					macaddr_factory_f100: macaddr@f100 {
+						compatible = "mac-base";
 						reg = <0xf100 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 
 					eeprom_factory_20000: eeprom@20000 {
@@ -71,14 +73,7 @@
 	};
 };
 
-&wmac {
-	status = "okay";
-
-	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100>;
-	nvmem-cell-names = "eeprom", "mac-address";
-};
-
 &ethernet {
-	nvmem-cells = <&macaddr_factory_f100>;
+	nvmem-cells = <&macaddr_factory_f100 0>;
 	nvmem-cell-names = "mac-address";
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index 2225b633338..0d09e543456 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -78,7 +78,10 @@
 };
 
 &wmac {
-	mac-address-increment = <(-2)>;
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 (-2)>;
+	nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &esw {
@@ -100,8 +103,7 @@
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>;
+		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <(-1)>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
index 04eba88d198..93695660aeb 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
@@ -95,8 +95,7 @@
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>;
+		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <(-1)>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index f628908b980..bfb39b3531c 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -83,6 +83,13 @@
 	};
 };
 
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
 	mediatek,portmap = <0x3e>;
 };
@@ -95,8 +102,7 @@
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>;
+		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <(-1)>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
index 87927da62a4..302a9d9c6a2 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -93,8 +93,7 @@
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>;
+		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <(-1)>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v6.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v6.dts
index 86cefbc2309..c3a890bc2dd 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v6.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v6.dts
@@ -88,9 +88,8 @@
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>;
+		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <(-1)>;
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
index 9d39906b41c..8826365bebf 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
@@ -106,7 +106,9 @@
 					#size-cells = <1>;
 
 					macaddr_config_2008: macaddr@2008 {
+						compatible = "mac-base";
 						reg = <0x2008 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -143,16 +145,15 @@
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_config_2008>;
+	nvmem-cells = <&macaddr_config_2008 0>;
 	nvmem-cell-names = "mac-address";
 };
 
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008>;
+	nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008 1>;
 	nvmem-cell-names = "eeprom", "mac-address";
-	mac-address-increment = <1>;
 };
 
 &pcie {
@@ -163,8 +164,7 @@
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008>;
+		nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008 2>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <2>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
index e1c68daccf7..9e0bea7cd11 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
@@ -43,7 +43,9 @@
 					#size-cells = <1>;
 
 					macaddr_config_10008: macaddr@10008 {
+						compatible = "mac-base";
 						reg = <0x10008 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -77,18 +79,16 @@
 };
 
 &wlan5g {
-	nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008>;
+	nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008 2>;
 	nvmem-cell-names = "eeprom", "mac-address";
-	mac-address-increment = <2>;
 };
 
 &wmac {
-	nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008>;
+	nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008 1>;
 	nvmem-cell-names = "eeprom", "mac-address";
-	mac-address-increment = <1>;
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_config_10008>;
+	nvmem-cells = <&macaddr_config_10008 0>;
 	nvmem-cell-names = "mac-address";
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
index d0d0701231e..d37febfbc87 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
@@ -43,7 +43,9 @@
 					#size-cells = <1>;
 
 					macaddr_config_2008: macaddr@2008 {
+						compatible = "mac-base";
 						reg = <0x2008 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -72,18 +74,16 @@
 };
 
 &wlan5g {
-	nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008>;
+	nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008 (-2)>;
 	nvmem-cell-names = "eeprom", "mac-address";
-	mac-address-increment = <(-2)>;
 };
 
 &wmac {
-	nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008>;
+	nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008 (-1)>;
 	nvmem-cell-names = "eeprom", "mac-address";
-	mac-address-increment = <(-1)>;
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_config_2008>;
+	nvmem-cells = <&macaddr_config_2008 0>;
 	nvmem-cell-names = "mac-address";
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
index 173b4cddcad..297e7b441d4 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -76,6 +76,13 @@
 	};
 };
 
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
 	mediatek,portmap = <0x3e>;
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
index de9a48445ad..44a483ed6d6 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
@@ -73,3 +73,10 @@
 		function = "gpio";
 	};
 };
+
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
index 46c18d6b2d8..01cbba20244 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
@@ -49,6 +49,13 @@
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_factory_f100>;
+	nvmem-cells = <&macaddr_factory_f100 0>;
 	nvmem-cell-names = "mac-address";
 };
+
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
index 8a8ba81ec30..e480395ffd4 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
@@ -66,6 +66,13 @@
 	};
 };
 
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
 	mediatek,portmap = <0x3e>;
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
index 5c7f9836b6a..e1e77eba237 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
@@ -92,6 +92,13 @@
 	};
 };
 
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
 	mediatek,portmap = <0x3e>;
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
index 9077ec00cec..b5c3bd9ab5b 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
@@ -76,6 +76,13 @@
 	};
 };
 
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
 	mediatek,portmap = <0x3e>;
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
index 7abeae9c07b..9fc7f97ae51 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
@@ -69,6 +69,13 @@
 	};
 };
 
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
 	mediatek,portmap = <0x3e>;
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
index b49dc61a4cf..0029be21e0f 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -83,6 +83,13 @@
 	};
 };
 
+&wmac {
+	status = "okay";
+
+	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+	nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &pcie {
 	status = "okay";
 };
@@ -91,8 +98,7 @@
 	mt76@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
-		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>;
+		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
-		mac-address-increment = <(-1)>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
index ef070549d36..7655da40db9 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
@@ -65,7 +65,9 @@
 					};
 
 					macaddr_factory_4: macaddr@4 {
+						compatible = "mac-base";
 						reg = <0x4 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 
 					macaddr_factory_28: macaddr@28 {
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
index 809a0af30af..49ca637cb9e 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
@@ -64,9 +64,8 @@
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 (-1)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-1)>;
 };
 
 &esw {
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
index 7b40cdb6af3..f40717267c7 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
@@ -64,9 +64,8 @@
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 (-1)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-1)>;
 };
 
 &esw {