diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-mi-router-hd.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-mi-router-hd.dts
index 1c11ab5e1d..e183dfe62b 100644
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-mi-router-hd.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-mi-router-hd.dts
@@ -220,7 +220,7 @@
 			compatible = "pci168c,0040";
 			reg = <0x00010000 0 0 0 0>;
 
-			nvmem-cells = <&macaddr_art_1006>, <&precal_art_1000>;
+			nvmem-cells = <&macaddr_art_1006 0>, <&precal_art_1000>;
 			nvmem-cell-names = "mac-address", "pre-calibration";
 		};
 	};
@@ -243,7 +243,7 @@
 			compatible = "pci168c,0040";
 			reg = <0x00010000 0 0 0 0>;
 
-			nvmem-cells = <&macaddr_art_5006>, <&precal_art_5000>;
+			nvmem-cells = <&macaddr_art_5006 0>, <&precal_art_5000>;
 			nvmem-cell-names = "mac-address", "pre-calibration";
 		};
 	};
@@ -333,26 +333,42 @@
 				read-only;
 
 				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_art_0: macaddr@0 {  // WAN (label)
-					reg = <0x0 0x6>;
-				};
-				macaddr_art_6: macaddr@6 {  // LAN
-					reg = <0x6 0x6>;
-				};
-				macaddr_art_1006: macaddr@1006 {  // WiFi 2g
-					reg = <0x1006 0x6>;
-				};
-				macaddr_art_5006: macaddr@5006 {  // WiFi 5g
-					reg = <0x5006 0x6>;
-				};
-				precal_art_1000: precal@1000 {
-					reg = <0x1000 0x2f20>;
-				};
-				precal_art_5000: precal@5000 {
-					reg = <0x5000 0x2f20>;
+					macaddr_art_0: macaddr@0 {
+						compatible = "mac-base";
+						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+
+					macaddr_art_6: macaddr@6 {
+						compatible = "mac-base";
+						reg = <0x6 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+
+					macaddr_art_1006: macaddr@1006 {
+						compatible = "mac-base";
+						reg = <0x1006 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+
+					macaddr_art_5006: macaddr@5006 {
+						compatible = "mac-base";
+						reg = <0x5006 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+
+					precal_art_1000: precal@1000 {
+						reg = <0x1000 0x2f20>;
+					};
+
+					precal_art_5000: precal@5000 {
+						reg = <0x5000 0x2f20>;
+					};
 				};
 			};
 
@@ -507,7 +523,7 @@
 	pinctrl-0 = <&rgmii2_pins>;
 	pinctrl-names = "default";
 
-	nvmem-cells = <&macaddr_art_0>;
+	nvmem-cells = <&macaddr_art_0 0>;
 	nvmem-cell-names = "mac-address";
 
 	fixed-link {
@@ -521,7 +537,7 @@
 	phy-mode = "sgmii";
 	qcom,id = <2>;
 
-	nvmem-cells = <&macaddr_art_6>;
+	nvmem-cells = <&macaddr_art_6 0>;
 	nvmem-cell-names = "mac-address";
 
 	fixed-link {