ramips: mt7628: use mac-base

mac-address-increment is deprecated.

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

diff --git a/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts b/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
index 19c220cabb50cb045046abc2d969178c331b9896..1d6304cfa771adedbf978c000000103a336cdb8e 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
+++ b/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
@@ -88,7 +88,9 @@
                                        };
 
                                        macaddr_factory_8004: macaddr@8004 {
+                                               compatible = "mac-base";
                                                reg = <0x8004 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_factory_e000: macaddr@e000 {
@@ -115,9 +117,8 @@
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004 2>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <2>;
        };
 };
 

diff --git a/target/linux/ramips/dts/mt7628an_linksys_e5400.dts b/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
index 183b5c3cd1429bda9ba1691a6f3565c7e897ae8c..26ff86dac2d25566b80be713e259669065ce23e4 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
+++ b/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
@@ -96,7 +96,9 @@
                                        };
 
                                        macaddr_factory_28: macaddr@28 {
+                                               compatible = "mac-base";
                                                reg = <0x28 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -126,7 +128,7 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cells = <&macaddr_factory_28 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -144,9 +146,8 @@
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
 
-               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28 3>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <3>;
        };
 };
 
@@ -164,8 +165,7 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28>;
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28 2>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <2>;
 };
 

diff --git a/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts b/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
index 003bd9f544ca19a97de5306358d62cd9b1bc7f7f..ebaa4326aea9883cdcf2fba20abd32c52fdb66d9 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
+++ b/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
@@ -86,7 +86,9 @@
                                        };
 
                                        macaddr_factory_4: macaddr@4 {
+                                               compatible = "mac-base";
                                                reg = <0x4 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -120,9 +122,8 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cells = <&macaddr_factory_4 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &esw {

diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
index e9fc6d7090fb8df1ae72f7400afead710b79d9a2..e3ee55873e969e659fa7e4f4d6773752c0c1d666 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
@@ -44,7 +44,6 @@
 };
 
 &wifi5 {
-       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cells = <&macaddr_factory_4 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(2)>;
 };

diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
index 6a3b654e08066b001a31ec52e267c308d066b7fb..98d132e891f1ab19b09968b4bc543d21a6bc992e 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
@@ -98,7 +98,9 @@
                                        };
 
                                        macaddr_factory_4: macaddr@4 {
+                                               compatible = "mac-base";
                                                reg = <0x4 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -120,7 +122,7 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cells = <&macaddr_factory_4 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
index fee3935fdfa823b00de6e6fb1621c2a79fc78b06..a5c9267c8d7ac6eccfc13fbbac00d4e86233898c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
@@ -63,7 +63,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_rom_f100: macaddr@f100 {
+                                               compatible = "mac-base";
                                                reg = <0xf100 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -99,12 +101,12 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&eeprom_radio_0>, <&macaddr_rom_f100>;
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_rom_f100 0>;
        nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_rom_f100>;
+       nvmem-cells = <&macaddr_rom_f100 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
index 90ccebe723e6c60a3c23a2e94350276f946be3ce..3db4bb9b9c24c1f968bb49a0d0f17e59b32767b6 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
@@ -55,7 +55,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_factory_f100: macaddr@f100 {
+                                               compatible = "mac-base";
                                                reg = <0xf100 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        eeprom_factory_20000: eeprom@20000 {
@@ -71,14 +73,7 @@
        };
 };
 
-&wmac {
-       status = "okay";
-
-       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100>;
-       nvmem-cell-names = "eeprom", "mac-address";
-};
-
 &ethernet {
-       nvmem-cells = <&macaddr_factory_f100>;
+       nvmem-cells = <&macaddr_factory_f100 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index 2225b6333386dd4022c8c365345bbfa058278883..0d09e5434564d23d7348f02b31b9de683bca0fed 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -78,7 +78,10 @@
 };
 
 &wmac {
-       mac-address-increment = <(-2)>;
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 (-2)>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &esw {
@@ -100,8 +103,7 @@
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>;
+               nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(-1)>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
index 04eba88d1981a025549c41d0869b73becebcea64..93695660aebb7c42dc8e86d7bb2dc959b626e277 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
@@ -95,8 +95,7 @@
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>;
+               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(-1)>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index f628908b9806fbdf0adb122c1eed674ee8586cc5..bfb39b3531ceba804bb224d13228d0761d79a913 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -83,6 +83,13 @@
        };
 };
 
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
        mediatek,portmap = <0x3e>;
 };
@@ -95,8 +102,7 @@
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>;
+               nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(-1)>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
index 87927da62a471cfb868a22cf39308854af570a8a..302a9d9c6a2abadc618f8c96854f78577ef96b2e 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -93,8 +93,7 @@
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>;
+               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(-1)>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v6.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v6.dts
index 86cefbc23092437c0e74cdd4f84f3643bdabc906..c3a890bc2ddd66865763491e717e590e2f1621f7 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v6.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v6.dts
@@ -88,9 +88,8 @@
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>;
+               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(-1)>;
        };
 };
 

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
index 9d39906b41c3bc5442da7bd31c874b57829ed713..8826365bebfd20889e3da40fbf4a38e66922b7eb 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
@@ -106,7 +106,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_2008: macaddr@2008 {
+                                               compatible = "mac-base";
                                                reg = <0x2008 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -143,16 +145,15 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_config_2008>;
+       nvmem-cells = <&macaddr_config_2008 0>;
        nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008>;
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008 1>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <1>;
 };
 
 &pcie {
@@ -163,8 +164,7 @@
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008>;
+               nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008 2>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <2>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
index e1c68daccf7d611e82a0b913d18eab2d4c9194ef..9e0bea7cd116a98a03d450f6c5b197d6ebee19ff 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
@@ -43,7 +43,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_10008: macaddr@10008 {
+                                               compatible = "mac-base";
                                                reg = <0x10008 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -77,18 +79,16 @@
 };
 
 &wlan5g {
-       nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008>;
+       nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008 2>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <2>;
 };
 
 &wmac {
-       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008>;
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008 1>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <1>;
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_config_10008>;
+       nvmem-cells = <&macaddr_config_10008 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
index d0d0701231e9bdd0d0b323cf6a1920c94f976d5c..d37febfbc87d00e662b170331fc382f74ebc705c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
@@ -43,7 +43,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_2008: macaddr@2008 {
+                                               compatible = "mac-base";
                                                reg = <0x2008 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -72,18 +74,16 @@
 };
 
 &wlan5g {
-       nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008>;
+       nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008 (-2)>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <(-2)>;
 };
 
 &wmac {
-       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008>;
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008 (-1)>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_config_2008>;
+       nvmem-cells = <&macaddr_config_2008 0>;
        nvmem-cell-names = "mac-address";
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
index 173b4cddcad1752dcad09b6cc52d368c9b62a074..297e7b441d4f9ebd960c37c99be5097e7982162f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -76,6 +76,13 @@
        };
 };
 
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
        mediatek,portmap = <0x3e>;
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
index de9a48445adc00663a5df6557db9ef621cbfd8e7..44a483ed6d6b0c7314c4df32e9af6d31ab18f9a5 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
@@ -73,3 +73,10 @@
                function = "gpio";
        };
 };
+
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
index 46c18d6b2d82a168bb4be83d98cf7879299d3c7d..01cbba2024481fb250e287d33599471475914e1d 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
@@ -49,6 +49,13 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_f100>;
+       nvmem-cells = <&macaddr_factory_f100 0>;
        nvmem-cell-names = "mac-address";
 };
+
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
index 8a8ba81ec309c3e0192a44a18dfbcde6cc4dfe21..e480395ffd46fbe9dee5a724d1faab6f1e8a183b 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
@@ -66,6 +66,13 @@
        };
 };
 
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
        mediatek,portmap = <0x3e>;
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
index 5c7f9836b6a9ae0808658d9d2416a94069fb138c..e1e77eba237eaf61bab39ca1120f55498aeabc25 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
@@ -92,6 +92,13 @@
        };
 };
 
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
        mediatek,portmap = <0x3e>;
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
index 9077ec00cecfba40b35ee73c148dd96d888f47c1..b5c3bd9ab5b8cc18ce178720af50827930179cf8 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
@@ -76,6 +76,13 @@
        };
 };
 
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
        mediatek,portmap = <0x3e>;
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
index 7abeae9c07b69492b0b04c5ed4ff87af6369b2b6..9fc7f97ae51085250bc43458025a9be2c1ae25ec 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
@@ -69,6 +69,13 @@
        };
 };
 
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &esw {
        mediatek,portmap = <0x3e>;
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
index b49dc61a4cf0492eea6afb93af79354a16a884ff..0029be21e0f9045b2d0d3912ee08b67db456a689 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -83,6 +83,13 @@
        };
 };
 
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
+};
+
 &pcie {
        status = "okay";
 };
@@ -91,8 +98,7 @@
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>;
+               nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <(-1)>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
index ef070549d36c45ce130dde0971c331fea99d3a62..7655da40db9bb079d15b9cbbe248bc06fe1e6b52 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
@@ -65,7 +65,9 @@
                                        };
 
                                        macaddr_factory_4: macaddr@4 {
+                                               compatible = "mac-base";
                                                reg = <0x4 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        macaddr_factory_28: macaddr@28 {

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
index 809a0af30aff050e3b08004f9b11e60b0f4dbbb4..49ca637cb9e6eb15b4d121dfda00bb514b69cc31 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
@@ -64,9 +64,8 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cells = <&macaddr_factory_4 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &esw {

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
index 7b40cdb6af3d9b46d7d56f626221c16d0cbabd27..f40717267c7a80a38dc8d1eea22e0aaad83207df 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
@@ -64,9 +64,8 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cells = <&macaddr_factory_4 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &esw {