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 4b4297a56899f2e5049ebb3ac8116f537c74d4e8..17f3c10bc90e40250580675d7399c7bcc7e589a6 100644 (file)
--- 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 4cd356e7a1269c08e8b90438d72039a54f74ab54..f23dc1cb03909898284d9a4c9040b020e5a00de2 100644 (file)
--- 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 84fb9affd2d2d8ad5baf2840d9dd26432331befa..ee2ca91af7ff5d7b4d3a2e94aeb58a1202b5ea00 100644 (file)
--- 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>;
 };