lantiq: remove mac-address-increment

It's deprecated.

Signed-off-by: Rosen Penev <[email protected]>

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts

@@ -97,9 +97,8 @@
 &gsw {
 	phy-mode = "rmii";
 	phy-handle = <&phy0>;
-	nvmem-cells = <&macaddr_ath9k_cal_a91>;
+	nvmem-cells = <&macaddr_ath9k_cal_a91 (-2)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-2)>;
 
 	mdio-bus {
 		#address-cells = <1>;
@@ -128,6 +127,18 @@
 				label = "urlader";
 				reg = <0x00000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_ath9k_cal_a91: macaddr@a91 {
+						compatible = "mac-base";
+						reg = <0xa91 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -171,13 +182,3 @@
 		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
 	};
 };
-
-&ath9k_cal {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_ath9k_cal_a91: macaddr@a91 {
-		reg = <0xa91 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts

@@ -99,9 +99,8 @@
 &gsw {
 	phy-mode = "mii";
 	phy-handle = <&phy0>;
-	nvmem-cells = <&macaddr_ath9k_cal_a91>;
+	nvmem-cells = <&macaddr_ath9k_cal_a91 (-2)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-2)>;
 
 	mdio-bus {
 		#address-cells = <1>;
@@ -155,6 +154,18 @@
 				label = "urlader";
 				reg = <0x00000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_ath9k_cal_a91: macaddr@a91 {
+						compatible = "mac-base";
+						reg = <0xa91 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -215,13 +226,3 @@
 	status = "okay";
 	vbus-supply = <&usb1_vbus>;
 };
-
-&ath9k_cal {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_ath9k_cal_a91: macaddr@a91 {
-		reg = <0xa91 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts

@@ -175,6 +175,16 @@
 				label = "board";
 				reg = <0x1fc0000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_10024: macaddr@10024 {
+						reg = <0x10024 0x6>;
+					};
+				};
 			};
 
 			partition@1fe0000 {
@@ -194,13 +204,3 @@
 	status = "okay";
 	vbus-supply = <&usb_vbus>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_10024: macaddr@10024 {
-		reg = <0x10024 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi

@@ -160,6 +160,16 @@
 				label = "boardconfig";
 				reg = <0x3f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -199,13 +209,3 @@
 	status = "okay";
 	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts

@@ -167,6 +167,16 @@
 				label = "boardconfig";
 				reg = <0x3f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -202,13 +212,3 @@
 	status = "okay";
 	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts

@@ -180,6 +180,16 @@
 				label = "boardconfig";
 				reg = <0x3f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -219,13 +229,3 @@
 	gpios = <&gpio 31 GPIO_ACTIVE_HIGH
 		&gpiomm 7 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts

@@ -129,6 +129,16 @@
 				label = "boardconfig";
 				reg = <0x3f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -148,13 +158,3 @@
 	status = "okay";
 	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts

@@ -198,6 +198,16 @@
 				label = "boardconfig";
 				reg = <0x3f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -237,13 +247,3 @@
 	gpios = <&gpio 31 GPIO_ACTIVE_HIGH
 		&gpiomm 7 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts

@@ -100,7 +100,7 @@
 /* GPIO 19: switch reset */
 &gsw {
 	phy-mode = "rmii";
-	nvmem-cells = <&macaddr_boardconfig_16>;
+	nvmem-cells = <&macaddr_boardconfig_16 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -136,6 +136,18 @@
 				label = "board_config";
 				reg = <0x7f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						compatible = "mac-base";
+						reg = <0x16 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 		};
 	};
@@ -155,18 +167,7 @@
 		reg = <0x7000 0 0 0 0>;
 		ralink,mtd-eeprom = <&boardconfig 0x410>;
 		ralink,eeprom-swap;
-		nvmem-cells = <&macaddr_boardconfig_16>;
+		nvmem-cells = <&macaddr_boardconfig_16 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
-	};
-};
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
 	};
 };

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts

@@ -153,6 +153,16 @@
 				label = "board_config";
 				reg = <0xfe0000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -195,13 +205,3 @@
 	status = "okay";
 	gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts

@@ -149,7 +149,7 @@
 */
 &gsw {
 	phy-mode = "mii";
-	nvmem-cells = <&macaddr_boardconfig_16>;
+	nvmem-cells = <&macaddr_boardconfig_16 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -184,6 +184,18 @@
 				label = "boardconfig";
 				reg = <0x7f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						compatible = "mac-base";
+						reg = <0x16 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 		};
 	};
@@ -213,9 +225,8 @@
 		compatible = "pci168c,0029";
 		reg = <0x7000 0 0 0 0>;
 		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
-		nvmem-cells = <&macaddr_boardconfig_16>;
+		nvmem-cells = <&macaddr_boardconfig_16 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 	};
 };
 
@@ -231,13 +242,3 @@
 &vmmc {
 	status = "okay";
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts

@@ -179,6 +179,16 @@
 				label = "board_config";
 				reg = <0xfe0000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -214,13 +224,3 @@
 &vmmc {
 	status = "okay";
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts

@@ -122,6 +122,16 @@
 				label = "board_config";
 				reg = <0x3f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -146,13 +156,3 @@
 	status = "okay";
 	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts

@@ -192,6 +192,16 @@
 				label = "board_config";
 				reg = <0x7f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -241,13 +251,3 @@
 	status = "okay";
 	gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts

@@ -207,6 +207,16 @@
 				label = "board_config";
 				reg = <0x7f0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -285,13 +295,3 @@
 	status = "okay";
 	gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts

@@ -107,7 +107,7 @@
 
 &gsw {
 	phy-mode = "mii";
-	nvmem-cells = <&macaddr_art_16>;
+	nvmem-cells = <&macaddr_art_16 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -143,6 +143,18 @@
 				label = "art";
 				reg = <0x7f0000 0x10000>;       /* 64 KiB*/
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_16: macaddr@16 {
+						compatible = "mac-base";
+						reg = <0x16 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 		};
 	};
@@ -160,9 +172,8 @@
 		compatible = "pci168c,0029";
 		reg = <0x7000 0 0 0 0>;
 		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
-		nvmem-cells = <&macaddr_art_16>;
+		nvmem-cells = <&macaddr_art_16 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 	};
 };
 
@@ -179,13 +190,3 @@
 	status = "okay";
 	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts

@@ -207,6 +207,16 @@
 				label = "boardconfig";
 				reg = <0x1f80000 0x80000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						reg = <0x16 0x6>;
+					};
+				};
 			};
 		};
 	};
@@ -234,13 +244,3 @@
 	status = "okay";
 	vbus-supply = <&usb_vbus>;
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi

@@ -108,7 +108,7 @@
 };
 
 &eth0 {
-	nvmem-cells = <&macaddr_boardconfig_16>;
+	nvmem-cells = <&macaddr_boardconfig_16 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -207,6 +207,18 @@
 				label = "board_config";
 				reg = <0xfe0000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						compatible = "mac-base";
+						reg = <0x16 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 		};
 	};
@@ -221,9 +233,8 @@
 		reg = <0x7000 0 0 0 0>;
 		ralink,mtd-eeprom = <&boardconfig 0x410>;
 		ralink,eeprom-swap;
-		nvmem-cells = <&macaddr_boardconfig_16>;
+		nvmem-cells = <&macaddr_boardconfig_16 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 	};
 };
 
@@ -246,13 +257,3 @@
 			 &gpio 31 GPIO_ACTIVE_HIGH  //still unknown
 			 &gpio 3  GPIO_ACTIVE_HIGH>; //reset_slic?
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi

@@ -127,9 +127,8 @@
 };
 
 &eth0 {
-	nvmem-cells = <&macaddr_boardconfig_16>;
+	nvmem-cells = <&macaddr_boardconfig_16 1>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <1>;
 };
 
 &gphy0 {
@@ -225,6 +224,18 @@
 				label = "board_config";
 				reg = <0x40000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_boardconfig_16: macaddr@16 {
+						compatible = "mac-base";
+						reg = <0x16 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 		};
 	};
@@ -239,9 +250,8 @@
 		reg = <0x7000 0 0 0 0>;
 		ralink,mtd-eeprom = <&boardconfig 0x410>;
 		ralink,eeprom-swap;
-		nvmem-cells = <&macaddr_boardconfig_16>;
+		nvmem-cells = <&macaddr_boardconfig_16 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 	};
 };
 
@@ -280,13 +290,3 @@
 		 &gpio 31 GPIO_ACTIVE_HIGH  //still unknown
 		 &gpio 3  GPIO_ACTIVE_HIGH>; //reset_slic?
 };
-
-&boardconfig {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_boardconfig_16: macaddr@16 {
-		reg = <0x16 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts

@@ -43,16 +43,20 @@
 				reg = <0x00000 0x20000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				cal_urlader_985: cal@985 {
-					reg = <0x985 0x440>;
-				};
-
-				macaddr_urlader_a91: macaddr@a91 {
-					reg = <0xa91 0x6>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					cal_urlader_985: cal@985 {
+						reg = <0x985 0x440>;
+					};
+
+					macaddr_urlader_a91: macaddr@a91 {
+						compatible = "mac-base";
+						reg = <0xa91 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
 				};
 			};
 
@@ -77,9 +81,8 @@
 };
 
 &eth0 {
-	nvmem-cells = <&macaddr_urlader_a91>;
+	nvmem-cells = <&macaddr_urlader_a91 (-2)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-2)>;
 };
 
 &phy0 {

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts

@@ -43,6 +43,18 @@
 				label = "urlader";
 				reg = <0x00000 0x20000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_urlader_a91: macaddr@a91 {
+						compatible = "mac-base";
+						reg = <0xa91 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -66,9 +78,8 @@
 };
 
 &eth0 {
-	nvmem-cells = <&macaddr_urlader_a91>;
+	nvmem-cells = <&macaddr_urlader_a91 (-2)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-2)>;
 };
 
 &phy0 {
@@ -78,13 +89,3 @@
 &phy1 {
 	reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 };
-
-&urlader {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_urlader_a91: macaddr@a91 {
-		reg = <0xa91 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts

@@ -47,6 +47,18 @@
 				reg = <0x0 0x40000>;
 				label = "urlader";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_urlader_a91: macaddr@a91 {
+						compatible = "mac-base";
+						reg = <0xa91 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@40000 {
@@ -104,9 +116,8 @@
 };
 
 &eth0 {
-	nvmem-cells = <&macaddr_urlader_a91>;
+	nvmem-cells = <&macaddr_urlader_a91 (-2)>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <(-2)>;
 };
 
 &phy0 {
@@ -116,13 +127,3 @@
 &phy1 {
 	reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 };
-
-&urlader {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_urlader_a91: macaddr@a91 {
-		reg = <0xa91 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi

@@ -110,7 +110,7 @@
 };
 
 &eth0 {
-	nvmem-cells = <&macaddr_ath9k_cal_f100>;
+	nvmem-cells = <&macaddr_ath9k_cal_f100 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -204,9 +204,8 @@
 			gpio-controller;
 			qca,no-eeprom;
 			ieee80211-freq-limit = <2402000 2482000>;
-			nvmem-cells = <&macaddr_ath9k_cal_f100>;
+			nvmem-cells = <&macaddr_ath9k_cal_f100 2>;
 			nvmem-cell-names = "mac-address";
-			mac-address-increment = <2>;
 		};
 	};
 };
@@ -246,6 +245,18 @@
 				reg = <0x7d0000 0x30000>;
 				label = "boardconfig";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_ath9k_cal_f100: macaddr@f100 {
+						compatible = "mac-base";
+						reg = <0xf100 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 		};
 	};
@@ -268,13 +279,3 @@
 	status = "okay";
 	vbus-supply = <&usb_vbus>;
 };
-
-&ath9k_cal {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_ath9k_cal_f100: macaddr@f100 {
-		reg = <0xf100 0x6>;
-	};
-};

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi

@@ -100,7 +100,7 @@
 };
 
 &eth0 {
-	nvmem-cells = <&macaddr_romfile_f100>;
+	nvmem-cells = <&macaddr_romfile_f100 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -192,9 +192,8 @@
 			mediatek,mtd-eeprom = <&radio 0x0000>;
 			big-endian;
 			ieee80211-freq-limit = <5000000 6000000>;
-			nvmem-cells = <&macaddr_romfile_f100>;
+			nvmem-cells = <&macaddr_romfile_f100 2>;
 			nvmem-cell-names = "mac-address";
-			mac-address-increment = <2>;
 		};
 	};
 };
@@ -245,6 +244,18 @@
 				reg = <0xfd0000 0x10000>;
 				label = "romfile";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_romfile_f100: macaddr@f100 {
+						compatible = "mac-base";
+						reg = <0xf100 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@fe0000 {
@@ -279,13 +290,3 @@
 	status = "okay";
 	vbus-supply = <&usb_vbus>;
 };
-
-&romfile {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_romfile_f100: macaddr@f100 {
-		reg = <0xf100 0x6>;
-	};
-};