From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 24 Nov 2023 01:40:09 +0000 (-0800)
Subject: ramips: rtxxxx: remove mac-address-increment
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b976fa5d2b57174665d06de79264148d30842ddc;p=openwrt%2Fstaging%2Fblogic.git

ramips: rtxxxx: remove mac-address-increment

Deprecated and replaced upstream with mac-base.

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

diff --git a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
index 4b4297a56899..17f3c10bc90e 100644
--- a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
+++ b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
@@ -64,9 +64,8 @@
 
 &ethernet {
 	status = "okay";
-	nvmem-cells = <&macaddr_factory_8004>;
+	nvmem-cells = <&macaddr_factory_8004 1>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <1>;
 
 	port@0 {
 		phy-handle = <&phy0>;
@@ -140,7 +139,9 @@
 					};
 
 					macaddr_factory_8004: macaddr@8004 {
+						compatible = "mac-base";
 						reg = <0x8004 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
index 4cd356e7a126..f23dc1cb0390 100644
--- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
+++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
@@ -51,7 +51,9 @@
 					};
 
 					macaddr_factory_4: macaddr@4 {
+						compatible = "mac-base";
 						reg = <0x4 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -109,7 +111,7 @@
 };
 
 &ethernet {
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 0>;
 	nvmem-cell-names = "mac-address";
 
 	port@0 {
@@ -129,7 +131,6 @@
 
 &wmac {
 	ralink,5ghz = <0>;
-	nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4>;
+	nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4 1>;
 	nvmem-cell-names = "eeprom", "mac-address";
-	mac-address-increment = <1>;
 };
diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
index 84fb9affd2d2..ee2ca91af7ff 100644
--- a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
+++ b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
@@ -51,7 +51,9 @@
 					};
 
 					macaddr_factory_4: macaddr@4 {
+						compatible = "mac-base";
 						reg = <0x4 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -109,7 +111,7 @@
 
 &ethernet {
 	status = "okay";
-	nvmem-cells = <&macaddr_factory_4>;
+	nvmem-cells = <&macaddr_factory_4 0>;
 	nvmem-cell-names = "mac-address";
 
 	port@0 {
@@ -155,7 +157,6 @@
 
 &wmac {
 	ralink,5ghz = <0>;
-	nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4>;
+	nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4 3>;
 	nvmem-cell-names = "eeprom", "mac-address";
-	mac-address-increment = <3>;
 };