From 05aec66d5326974a636afe9fbf678a86c7f4e5c8 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Sat, 15 Jun 2024 01:20:50 +0000 Subject: [PATCH] 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 --- 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 bd335894c819..e4bc6e211b4e 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@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 96a6b286fe6c..bbf6244d958a 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@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 6d77044aa45d..2ef9c10a42ec 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@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 d7510c292b7e..d94d36e9a60b 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 432aa5abd208..845afd4ec1f7 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@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 7b2465c14fa5..e6a3f40fecc9 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@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 97b18680d9e0..e88863eddf98 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@28 { reg = <0x28 0x6>; }; - - macaddr_factory_8004: macaddr@8004 { - reg = <0x8004 0x6>; - }; }; }; -- 2.30.2