From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 11 Nov 2023 02:42:52 +0000 (-0800)
Subject: octeon: remove mac-address-increment
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=733a99d8247b999b10eeab6c9b17136fbb2d9d9c;p=openwrt%2Fstaging%2Fblocktrron.git

octeon: remove mac-address-increment

It's deprecated.

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

diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
index f8d511b599..401aafe167 100644
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
@@ -14,7 +14,7 @@
 			status = "okay";
 			phy-mode = "sgmii";
 			phy-handle = <&phy4>;
-			nvmem-cells = <&macaddr_eeprom_0>;
+			nvmem-cells = <&macaddr_eeprom_0 0>;
 			nvmem-cell-names = "mac-address";
 		};
 	};
diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
index f354d08199..270e2a3264 100644
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
@@ -32,7 +32,7 @@
 			status = "okay";
 			phy-mode = "sgmii";
 			phy-handle = <&phy4>;
-			nvmem-cells = <&macaddr_eeprom_0>;
+			nvmem-cells = <&macaddr_eeprom_0 0>;
 			nvmem-cell-names = "mac-address";
 		};
 	};
@@ -45,9 +45,8 @@
 			status = "okay";
 			phy-mode = "sgmii";
 			phy-handle = <&phy8>;
-			nvmem-cells = <&macaddr_eeprom_0>;
+			nvmem-cells = <&macaddr_eeprom_0 4>;
 			nvmem-cell-names = "mac-address";
-			mac-address-increment = <(4)>;
 		};
 
 		ethernet@1 {
@@ -55,9 +54,8 @@
 			status = "okay";
 			phy-mode = "sgmii";
 			phy-handle = <&phy9>;
-			nvmem-cells = <&macaddr_eeprom_0>;
+			nvmem-cells = <&macaddr_eeprom_0 5>;
 			nvmem-cell-names = "mac-address";
-			mac-address-increment = <(5)>;
 		};
 	};
 };
diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
index 9be52f9175..ad73a08a1e 100644
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
@@ -117,16 +117,20 @@
 			};
 
 			partition@400000 {
-				compatible = "nvmem-cells";
-				reg = <0x400000 0x10000>;
 				label = "eeprom";
 				read-only;
+				reg = <0x400000 0x10000>;
 
-				#address-cells = <1>;
-				#size-cells = <1>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_eeprom_0: macaddr@0 {
-					reg = <0x0 0x6>;
+					macaddr_eeprom_0: macaddr@0 {
+						compatible = "mac-base";
+						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
 				};
 			};
 		};
@@ -194,9 +198,8 @@
 			status = "okay";
 			phy-mode = "sgmii";
 			phy-handle = <&phy5>;
-			nvmem-cells = <&macaddr_eeprom_0>;
+			nvmem-cells = <&macaddr_eeprom_0 1>;
 			nvmem-cell-names = "mac-address";
-			mac-address-increment = <(1)>;
 		};
 
 		ethernet@2 {
@@ -204,9 +207,8 @@
 			status = "okay";
 			phy-mode = "sgmii";
 			phy-handle = <&phy6>;
-			nvmem-cells = <&macaddr_eeprom_0>;
+			nvmem-cells = <&macaddr_eeprom_0 2>;
 			nvmem-cell-names = "mac-address";
-			mac-address-increment = <(2)>;
 		};
 
 		ethernet@3 {
@@ -214,10 +216,8 @@
 			status = "okay";
 			phy-mode = "sgmii";
 			phy-handle = <&phy7>;
-			nvmem-cells = <&macaddr_eeprom_0>;
+			nvmem-cells = <&macaddr_eeprom_0 3>;
 			nvmem-cell-names = "mac-address";
-			mac-address-increment = <(3)>;
 		};
 	};
 };
-