diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts
index d564420897..2e7a5dcb34 100644
--- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts
@@ -71,7 +71,7 @@
 		reg = <0>;
 		phy-mode = "2500base-x";
 
-		nvmem-cells = <&macaddr_art_7b>;
+		nvmem-cells = <&macaddr_art_7b 0>;
 		nvmem-cell-names = "mac-address-ascii";
 
 		fixed-link {
@@ -140,13 +140,17 @@
 				reg = <0x180000 0x100000>;
 
 				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_art_7b: macaddr@7b {
-					reg = <0x7b 0x11>;
+					macaddr_art_7b: macaddr@7b {
+						compatible = "mac-base";
+						reg = <0x7b 0x11>;
+						#nvmem-cell-cells = <1>;
+					};
 				};
-
 			};
 
 			factory: partition@280000 {
@@ -191,9 +195,8 @@
 			reg = <3>;
 			label = "wan";
 
-			nvmem-cells = <&macaddr_art_7b>;
+			nvmem-cells = <&macaddr_art_7b 3>;
 			nvmem-cell-names = "mac-address-ascii";
-			mac-address-increment = <3>;
 		};
 
 		port@6 {
diff --git a/target/linux/mediatek/dts/mt7981b-jcg-q30-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-jcg-q30-ubootmod.dts
index 016016dbb0..ea58a5c42d 100644
--- a/target/linux/mediatek/dts/mt7981b-jcg-q30-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7981b-jcg-q30-ubootmod.dts
@@ -71,7 +71,7 @@
 		reg = <0>;
 		phy-mode = "2500base-x";
 
-		nvmem-cells = <&macaddr_factory_a002a>;
+		nvmem-cells = <&macaddr_factory_a002a 0>;
 		nvmem-cell-names = "mac-address";
 
 		fixed-link {
@@ -139,15 +139,22 @@
 				reg = <0x180000 0x200000>;
 
 				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_a002a: macaddr@a002a {
-					reg = <0xa002a 0x6>;
-				};
+					macaddr_factory_a002a: macaddr@a002a {
+						compatible = "mac-base";
+						reg = <0xa002a 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
 
-				macaddr_factory_a0024: macaddr@a0024 {
-					reg = <0xa0024 0x6>;
+					macaddr_factory_a0024: macaddr@a0024 {
+						compatible = "mac-base";
+						reg = <0xa0024 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
 				};
 			};
 
@@ -173,7 +180,7 @@
 			reg = <0>;
 			label = "wan";
 
-			nvmem-cells = <&macaddr_factory_a0024>;
+			nvmem-cells = <&macaddr_factory_a0024 0>;
 			nvmem-cell-names = "mac-address";
 		};
 
diff --git a/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi b/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi
index 0f094c3946..200a64a143 100644
--- a/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi
@@ -95,7 +95,7 @@
 		reg = <0>;
 		phy-mode = "2500base-x";
 
-		nvmem-cells = <&macaddr_config_50707>;
+		nvmem-cells = <&macaddr_config_50707 0>;
 		nvmem-cell-names = "mac-address-ascii";
 
 		fixed-link {
@@ -173,15 +173,22 @@
 				read-only;
 
 				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_config_50707: macaddr@50707 {
-					reg = <0x50707 0x11>;
-				};
+					macaddr_config_50707: macaddr@50707 {
+						compatible = "mac-base";
+						reg = <0x50707 0x11>;
+						#nvmem-cell-cells = <1>;
+					};
 
-				macaddr_config_50787: macaddr@50787 {
-					reg = <0x50787 0x11>;
+					macaddr_config_50787: macaddr@50787 {
+						compatible = "mac-base";
+						reg = <0x50787 0x11>;
+						#nvmem-cell-cells = <1>;
+					};
 				};
 			};
 		};
@@ -197,7 +204,7 @@
 			reg = <0>;
 			label = "wan";
 
-			nvmem-cells = <&macaddr_config_50787>;
+			nvmem-cells = <&macaddr_config_50787 0>;
 			nvmem-cell-names = "mac-address-ascii";
 		};
 
diff --git a/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts
index f09f11b4e4..6ad66bb22e 100644
--- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts
@@ -68,7 +68,7 @@
 		reg = <0>;
 		phy-mode = "2500base-x";
 
-		nvmem-cells = <&macaddr_factory_14>;
+		nvmem-cells = <&macaddr_factory_14 0>;
 		nvmem-cell-names = "mac-address-ascii";
 
 		fixed-link {
@@ -158,13 +158,17 @@
 				read-only;
 
 				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_factory_14: macaddr@14 {
-					reg = <0x14 0x11>;
+					macaddr_factory_14: macaddr@14 {
+						compatible = "mac-base";
+						reg = <0x14 0x11>;
+						#nvmem-cell-cells = <1>;
+					};
 				};
-
 			};
 
 			partition@7300000 {
@@ -200,9 +204,8 @@
 			reg = <3>;
 			label = "wan";
 
-			nvmem-cells = <&macaddr_factory_14>;
+			nvmem-cells = <&macaddr_factory_14 1>;
 			nvmem-cell-names = "mac-address-ascii";
-			mac-address-increment = <1>;
 		};
 
 		port@6 {