From b0d418035e92733fa9a58575b973b4bc0db0421a Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Sun, 16 Jun 2024 09:24:26 +0200 Subject: [PATCH] ramips: tplink_8m: cleaning up nvmem-cells definitions Move nvmem-cells definitions to dts files for compatibility with other files in which mt7628an_tplink_8m.dtsi is loaded, to prevent overwriting Signed-off-by: Mieczyslaw Nalewaj --- target/linux/ramips/dts/mt7628an_tplink_8m.dtsi | 5 ----- target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts | 5 +++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v4.dts | 5 +++++ 11 files changed, 50 insertions(+), 5 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi index 3db4bb9b9c..4956c12d9c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi @@ -72,8 +72,3 @@ }; }; }; - -ðernet { - 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 66e2cfdde7..6e6d7253bd 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -91,6 +91,11 @@ nvmem-cell-names = "eeprom", "mac-address"; }; +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "mac-address"; +}; + &esw { mediatek,portmap = <0x3e>; }; 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 c20eb3c46f..0e9159402e 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts @@ -97,6 +97,11 @@ nvmem-cell-names = "eeprom", "mac-address"; }; +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "mac-address"; +}; + &esw { mediatek,portmap = <0x3e>; }; 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 fcdc1d6d37..db6c73b001 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts @@ -92,6 +92,11 @@ nvmem-cell-names = "eeprom", "mac-address"; }; +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "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 01d5d756e3..d0119a76b8 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -87,3 +87,8 @@ nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>; nvmem-cell-names = "eeprom", "mac-address"; }; + +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "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 408e5fd956..0109178b79 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts @@ -80,6 +80,11 @@ nvmem-cell-names = "eeprom", "mac-address"; }; +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "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 2e5aabd581..755b93535f 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts @@ -106,6 +106,11 @@ nvmem-cell-names = "eeprom", "mac-address"; }; +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "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 0ded67a1a6..c2b91649c6 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts @@ -92,6 +92,11 @@ nvmem-cell-names = "eeprom", "mac-address"; }; +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "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 b8a394b26b..6c709da0a3 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts @@ -83,6 +83,11 @@ nvmem-cell-names = "eeprom", "mac-address"; }; +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "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 d280c6b32a..bebb02d0f4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts @@ -98,6 +98,11 @@ nvmem-cell-names = "eeprom", "mac-address"; }; +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "mac-address"; +}; + &pcie { status = "okay"; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v4.dts index a41e87edf7..946efb9443 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v4.dts @@ -111,3 +111,8 @@ nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 0>; nvmem-cell-names = "eeprom", "mac-address"; }; + +ðernet { + nvmem-cells = <&macaddr_factory_f100 0>; + nvmem-cell-names = "mac-address"; +}; -- 2.30.2