ramips: fix MAC address for some devices

1. Remove unused macaddr NVMEM cells.
2. Fix "mac-base" compatible cells references.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>

diff --git a/target/linux/ramips/dts/mt7620a_bolt_bl100.dts b/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
index bd335894c81994c3ef64a68ca563bb86fec3a163..e4bc6e211b4e858431f07aeaa1522c2ab439d72c 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
+++ b/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
@@ -183,9 +183,7 @@
                                        };
 
                                        macaddr_factory_28: macaddr@28 {
-                                               compatible = "mac-base";
                                                reg = <0x28 0x6>;
-                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi b/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi
index 96a6b286fe6c72b01d3ec45c330623b1d2bedb2a..bbf6244d958a65482c221d1fef8e605374b982dd 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi
+++ b/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi
@@ -50,7 +50,9 @@
                                        };
 
                                        macaddr_factory_e006: macaddr@e006 {
+                                               compatible = "mac-base";
                                                reg = <0xe006 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi b/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi
index 6d77044aa45d6eea57a140aa26e6d8c44c53dfee..2ef9c10a42ec353b08d7477604597cf3235bcf0b 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi
+++ b/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi
@@ -56,7 +56,9 @@
                                        };
 
                                        macaddr_factory_e006: macaddr@e006 {
+                                               compatible = "mac-base";
                                                reg = <0xe006 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
index d7510c292b7e6f55688976ff12d1d7e2fb4906dd..d94d36e9a60bfae112ca14d6aaf5e5dcb9199087 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
@@ -13,7 +13,7 @@
 };
 
 &gmac1 {
-       nvmem-cells = <&macaddr_factory_e006>;
+       nvmem-cells = <&macaddr_factory_e006 0>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ramips/dts/mt7621_hanyang_hyc-g920.dts b/target/linux/ramips/dts/mt7621_hanyang_hyc-g920.dts
index 432aa5abd2083c9d17536b908c1b030714f63bc4..845afd4ec1f7914b212958f59900db67040388da 100644 (file)
--- a/target/linux/ramips/dts/mt7621_hanyang_hyc-g920.dts
+++ b/target/linux/ramips/dts/mt7621_hanyang_hyc-g920.dts
@@ -100,10 +100,6 @@
                                                reg = <0x4 0x6>;
                                                #nvmem-cell-cells = <1>;
                                        };
-
-                                       macaddr_factory_8004: macaddr@8004 {
-                                               reg = <0x8004 0x6>;
-                                       };
                                };
                        };
 

diff --git a/target/linux/ramips/dts/mt7621_iptime_a3004t.dts b/target/linux/ramips/dts/mt7621_iptime_a3004t.dts
index 7b2465c14fa52fffd50a5c91c58d7d849bc78227..e6a3f40fecc93f090346190f3575e7898c232942 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iptime_a3004t.dts
+++ b/target/linux/ramips/dts/mt7621_iptime_a3004t.dts
@@ -93,10 +93,6 @@
                                        reg = <0x4 0x6>;
                                        #nvmem-cell-cells = <1>;
                                };
-
-                               macaddr_factory_8004: macaddr@8004 {
-                                       reg = <0x8004 0x6>;
-                               };
                        };
                };
 

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 97b18680d9e03b7e359c5d29a6cdec5c14cde81c..e88863eddf98a3f8d57e7e861482af4149dec001 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
@@ -73,10 +73,6 @@
                                        macaddr_factory_28: macaddr@28 {
                                                reg = <0x28 0x6>;
                                        };
-
-                                       macaddr_factory_8004: macaddr@8004 {
-                                               reg = <0x8004 0x6>;
-                                       };
                                };
                        };