bmips: remove mac-address-increment

It's deprecated.

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

target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi

@@ -187,6 +187,16 @@
 				label = "cferom";
 				reg = <0x0000000 0x0020000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cferom_6a0: macaddr@6a0 {
+						reg = <0x6a0 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -284,13 +294,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cferom {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cferom_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts

@@ -170,6 +170,16 @@
 				label = "cferom";
 				reg = <0x0000000 0x0020000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cferom_6a0: macaddr@6a0 {
+						reg = <0x6a0 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -228,13 +238,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cferom {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cferom_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts

@@ -46,9 +46,8 @@
 		pci-bus = <1>;
 		pci-dev = <0>;
 
-		nvmem-cells = <&macaddr_cferom_6a0>;
+		nvmem-cells = <&macaddr_cferom_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm4360-sprom.bin";
 	};
@@ -61,7 +60,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cferom_6a0>;
+	nvmem-cells = <&macaddr_cferom_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -196,6 +195,18 @@
 				label = "cferom";
 				reg = <0x0000000 0x0020000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cferom_6a0: macaddr@6a0 {
+						compatible = "mac-base";
+						reg = <0x6a0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -309,13 +320,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cferom {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cferom_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts

@@ -185,6 +185,16 @@
 				label = "cferom";
 				reg = <0x0000000 0x0020000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cferom_6a0: macaddr@6a0 {
+						reg = <0x6a0 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -225,13 +235,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cferom {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cferom_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts

@@ -38,9 +38,8 @@
 		pci-bus = <1>;
 		pci-dev = <0>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43217-sprom.bin";
 		brcm,sprom-fixups = <6 0x1c00>,
@@ -64,7 +63,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -90,6 +89,18 @@
 				reg = <0x000000 0x010000>;
 				label = "cfe";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cfe_6a0: macaddr@6a0 {
+						compatible = "mac-base";
+						reg = <0x6a0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@10000 {
@@ -247,13 +258,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts

@@ -36,9 +36,8 @@
 		pci-bus = <1>;
 		pci-dev = <0>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43227-sprom.bin";
 	};
@@ -51,7 +50,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -74,6 +73,18 @@
 				label = "cfe";
 				reg = <0x000000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cfe_6a0: macaddr@6a0 {
+						compatible = "mac-base";
+						reg = <0x6a0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@10000 {
@@ -174,13 +185,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts

@@ -31,9 +31,8 @@
 		pci-bus = <1>;
 		pci-dev = <0>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43225-sprom.bin";
 		brcm,sprom-fixups = <97 0xfee5>,
@@ -52,7 +51,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -78,6 +77,18 @@
 				reg = <0x000000 0x010000>;
 				label = "cfe";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cfe_6a0: macaddr@6a0 {
+						compatible = "mac-base";
+						reg = <0x6a0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@10000 {
@@ -178,13 +189,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts

@@ -31,9 +31,8 @@
 		pci-bus = <1>;
 		pci-dev = <0>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43225-sprom.bin";
 		brcm,sprom-fixups = <2 0x05bb>,
@@ -70,7 +69,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -96,6 +95,18 @@
 				reg = <0x000000 0x010000>;
 				label = "cfe";
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cfe_6a0: macaddr@6a0 {
+						compatible = "mac-base";
+						reg = <0x6a0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@10000 {
@@ -205,13 +216,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts

@@ -38,9 +38,8 @@
 		pci-bus = <1>;
 		pci-dev = <0>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43217-sprom.bin";
 	};
@@ -53,7 +52,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -76,6 +75,18 @@
 				label = "cfe";
 				reg = <0x000000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cfe_6a0: macaddr@6a0 {
+						compatible = "mac-base";
+						reg = <0x6a0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@10000 {
@@ -204,13 +215,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts

@@ -45,9 +45,8 @@
 		pci-bus = <1>;
 		pci-dev = <0>;
 
-		nvmem-cells = <&macaddr_cferom_6a0>;
+		nvmem-cells = <&macaddr_cferom_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43217-sprom.bin";
 		brcm,sprom-fixups = <6 0x1c00>,
@@ -77,7 +76,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cferom_6a0>;
+	nvmem-cells = <&macaddr_cferom_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -192,6 +191,18 @@
 				label = "cferom";
 				reg = <0x0000000 0x0020000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cferom_6a0: macaddr@6a0 {
+						compatible = "mac-base";
+						reg = <0x6a0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -300,13 +311,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cferom {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cferom_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts

@@ -134,7 +134,7 @@
 &ethernet1 {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 
 	phy-mode = "mii";
@@ -162,9 +162,8 @@
 
 		qca,no-eeprom;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		#gpio-cells = <2>;
 		gpio-controller;
@@ -183,6 +182,18 @@
 			label = "cfe";
 			reg = <0x000000 0x020000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_cfe_6a0: macaddr@6a0 {
+					compatible = "mac-base";
+					reg = <0x6a0 0x6>;
+					#nvmem-cell-cells = <1>;
+				};
+			};
 		};
 
 		partition@20000 {
@@ -195,6 +206,16 @@
 			label = "cal_data";
 			reg = <0xee0000 0x100000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				cal_data_1e000: cal@1e000 {
+					reg = <0x1e000 0xeb8>;
+				};
+			};
 		};
 
 		partition@fe0000 {
@@ -211,23 +232,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cal_data {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	cal_data_1e000: cal@1e000 {
-		reg = <0x1e000 0xeb8>;
-	};
-};
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts

@@ -164,6 +164,16 @@
 				label = "cferom";
 				reg = <0x0000000 0x0020000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cferom_6a0: macaddr@6a0 {
+						reg = <0x6a0 0x6>;
+					};
+				};
 			};
 
 			partition@20000 {
@@ -224,13 +234,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cferom {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cferom_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts

@@ -216,6 +216,16 @@
 				label = "cferom";
 				reg = <0x0000000 0x0004000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_cferom_6a0: macaddr@6a0 {
+						reg = <0x6a0 0x6>;
+					};
+				};
 			};
 
 			partition@4000 {
@@ -298,13 +308,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cferom {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cferom_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts

@@ -178,6 +178,16 @@
 			label = "CFE";
 			reg = <0x000000 0x020000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_cfe_6a0: macaddr@6a0 {
+					reg = <0x6a0 0x6>;
+				};
+			};
 		};
 
 		partition@20000 {
@@ -208,13 +218,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts

@@ -61,9 +61,8 @@
 		pci-bus = <0>;
 		pci-dev = <1>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43222-sprom.bin";
 		brcm,sprom-fixups = <97 0xfeb3>,
@@ -82,7 +81,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -106,6 +105,18 @@
 			label = "CFE";
 			reg = <0x0000000 0x0020000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_cfe_6a0: macaddr@6a0 {
+					compatible = "mac-base";
+					reg = <0x6a0 0x6>;
+					#nvmem-cell-cells = <1>;
+				};
+			};
 		};
 
 		partition@20000 {
@@ -170,13 +181,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts

@@ -61,9 +61,8 @@
 		pci-bus = <0>;
 		pci-dev = <1>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43222-sprom.bin";
 		brcm,sprom-fixups = <97 0xfeb3>,
@@ -82,7 +81,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -106,6 +105,18 @@
 			label = "CFE";
 			reg = <0x000000 0x010000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_cfe_6a0: macaddr@6a0 {
+					compatible = "mac-base";
+					reg = <0x6a0 0x6>;
+					#nvmem-cell-cells = <1>;
+				};
+			};
 		};
 
 		partition@20000 {
@@ -170,13 +181,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi

@@ -207,6 +207,16 @@
 			label = "CFE";
 			reg = <0x0000000 0x0020000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_cfe_6a0: macaddr@6a0 {
+					reg = <0x6a0 0x6>;
+				};
+			};
 		};
 
 		partition@20000 {
@@ -253,13 +263,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6368-observa-vh4032n.dts

@@ -83,9 +83,8 @@
 		pci-bus = <0>;
 		pci-dev = <1>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm43222-sprom.bin";
 		brcm,sprom-fixups = <2   0x04d2>, <4   0x4350>,
@@ -124,7 +123,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -157,6 +156,18 @@
 			label = "CFE";
 			reg = <0x0000000 0x0020000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_cfe_6a0: macaddr@6a0 {
+					compatible = "mac-base";
+					reg = <0x6a0 0x6>;
+					#nvmem-cell-cells = <1>;
+				};
+			};
 		};
 
 		partition@20000 {
@@ -221,13 +232,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts

@@ -80,9 +80,8 @@
 		pci-bus = <0>;
 		pci-dev = <1>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm4322-sprom.bin";
 		brcm,sprom-fixups = <97 0xfeed>,
@@ -101,7 +100,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -170,6 +169,18 @@
 			label = "CFE";
 			reg = <0x000000 0x010000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_cfe_6a0: macaddr@6a0 {
+					compatible = "mac-base";
+					reg = <0x6a0 0x6>;
+					#nvmem-cell-cells = <1>;
+				};
+			};
 		};
 
 		partition@20000 {
@@ -218,13 +229,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};

target/linux/bmips/dts/bcm6369-netgear-evg2000.dts

@@ -88,9 +88,8 @@
 		pci-bus = <0>;
 		pci-dev = <1>;
 
-		nvmem-cells = <&macaddr_cfe_6a0>;
+		nvmem-cells = <&macaddr_cfe_6a0 1>;
 		nvmem-cell-names = "mac-address";
-		mac-address-increment = <1>;
 
 		brcm,sprom = "brcm/bcm4322-sprom.bin";
 		brcm,sprom-fixups = <219 0xec08>;
@@ -104,7 +103,7 @@
 &ethernet {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_cfe_6a0>;
+	nvmem-cells = <&macaddr_cfe_6a0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -189,6 +188,18 @@
 			label = "CFE";
 			reg = <0x000000 0x020000>;
 			read-only;
+
+			nvmem-layout {
+				compatible = "fixed-layout";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				macaddr_cfe_6a0: macaddr@6a0 {
+					compatible = "mac-base";
+					reg = <0x6a0 0x6>;
+					#nvmem-cell-cells = <1>;
+				};
+			};
 		};
 
 		partition@20000 {
@@ -225,13 +236,3 @@
 &usbh {
 	status = "okay";
 };
-
-&cfe {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_cfe_6a0: macaddr@6a0 {
-		reg = <0x6a0 0x6>;
-	};
-};