[openwrt/openwrt] ramips: fix MAC address for some devices

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/05aec66d5326974a636afe9fbf678a86c7f4e5c8

commit 05aec66d5326974a636afe9fbf678a86c7f4e5c8
Author: Shiji Yang <yangshiji66 at qq.com>
AuthorDate: Sat Jun 15 01:20:50 2024 +0000

    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 at qq.com>
---
 target/linux/ramips/dts/mt7620a_bolt_bl100.dts           | 2 --
 target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi   | 2 ++
 target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi   | 2 ++
 target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts   | 2 +-
 target/linux/ramips/dts/mt7621_hanyang_hyc-g920.dts      | 4 ----
 target/linux/ramips/dts/mt7621_iptime_a3004t.dts         | 4 ----
 target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi | 4 ----
 7 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/target/linux/ramips/dts/mt7620a_bolt_bl100.dts b/target/linux/ramips/dts/mt7620a_bolt_bl100.dts
index bd335894c8..e4bc6e211b 100644
--- 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 at 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 96a6b286fe..bbf6244d95 100644
--- 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 at 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 6d77044aa4..2ef9c10a42 100644
--- 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 at 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 d7510c292b..d94d36e9a6 100644
--- 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 432aa5abd2..845afd4ec1 100644
--- 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 at 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 7b2465c14f..e6a3f40fec 100644
--- 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 at 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 97b18680d9..e88863eddf 100644
--- 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 at 28 {
 						reg = <0x28 0x6>;
 					};
-
-					macaddr_factory_8004: macaddr at 8004 {
-						reg = <0x8004 0x6>;
-					};
 				};
 			};