From aad70359244559d0de8c41a7419f2f74d14ab72b Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 4 Nov 2023 13:05:10 +0800 Subject: [PATCH] mediatek: switch to new nvmem fixed-layout binding Signed-off-by: Tianling Shen --- .../dts/mt7981b-abt-asr3000-ubootmod.dts | 21 +++++++++----- .../dts/mt7981b-cetron-ct3003-ubootmod.dts | 22 ++++++++------ .../dts/mt7981b-cmcc-a10-ubootmod.dts | 25 ++++++++++------ .../mt7981b-cmcc-rax3000m-nand-ubootmod.dts | 25 ++++++++++------ .../dts/mt7981b-cmcc-rax3000m-nand.dtso | 25 ++++++++++------ .../mediatek/dts/mt7981b-jcg-q30-ubootmod.dts | 25 ++++++++++------ .../mediatek/dts/mt7981b-livinet-zr-3020.dts | 29 ++++++++++++------- .../dts/mt7981b-qihoo-360t7-ubootmod.dts | 19 +++++++----- .../dts/mt7981b-zyxel-nwa50ax-pro.dts | 1 + 9 files changed, 120 insertions(+), 72 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts index 8a4643116d..4dbcf9eaac 100644 --- a/target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-abt-asr3000-ubootmod.dts @@ -87,8 +87,8 @@ reg = <0>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_art_7c>; - nvmem-cell-names = "mac-address-ascii"; + nvmem-cells = <&macaddr_art_7c 0>; + nvmem-cell-names = "mac-address"; fixed-link { speed = <2500>; @@ -103,8 +103,8 @@ phy-mode = "gmii"; phy-handle = <&int_gbe_phy>; - nvmem-cells = <&macaddr_art_7c>; - nvmem-cell-names = "mac-address-ascii"; + nvmem-cells = <&macaddr_art_7c 0>; + nvmem-cell-names = "mac-address"; }; }; @@ -167,11 +167,16 @@ read-only; compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_art_7c: macaddr@7c { - reg = <0x7c 0x11>; + macaddr_art_7c: macaddr@7c { + compatible = "mac-base"; + reg = <0x7c 0x11>; + #nvmem-cell-cells = <1>; + }; }; }; diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts index 106c1f7092..e5a8ff4997 100644 --- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003-ubootmod.dts @@ -71,8 +71,8 @@ reg = <0>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_art_7b>; - nvmem-cell-names = "mac-address-ascii"; + nvmem-cells = <&macaddr_art_7b 0>; + nvmem-cell-names = "mac-address"; fixed-link { speed = <2500>; @@ -140,11 +140,16 @@ reg = <0x180000 0x100000>; compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_art_7b: macaddr@7b { - reg = <0x7b 0x11>; + macaddr_art_7b: macaddr@7b { + compatible = "mac-base"; + reg = <0x7b 0x11>; + #nvmem-cell-cells = <1>; + }; }; }; @@ -191,9 +196,8 @@ reg = <3>; label = "wan"; - nvmem-cells = <&macaddr_art_7b>; - nvmem-cell-names = "mac-address-ascii"; - mac-address-increment = <3>; + nvmem-cells = <&macaddr_art_7b 3>; + nvmem-cell-names = "mac-address"; }; port@6 { diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts index d2552a0ba5..10f060c4ca 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts @@ -73,7 +73,7 @@ reg = <0>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_factory_2a>; + nvmem-cells = <&macaddr_factory_2a 0>; nvmem-cell-names = "mac-address"; fixed-link { @@ -135,15 +135,22 @@ reg = <0x180000 0x200000>; compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_factory_24: macaddr@24 { - reg = <0x24 0x6>; - }; + macaddr_factory_24: macaddr@24 { + compatible = "mac-base"; + reg = <0x24 0x6>; + #nvmem-cell-cells = <1>; + }; - macaddr_factory_2a: macaddr@2a { - reg = <0x2a 0x6>; + macaddr_factory_2a: macaddr@2a { + compatible = "mac-base"; + reg = <0x2a 0x6>; + #nvmem-cell-cells = <1>; + }; }; }; @@ -184,7 +191,7 @@ reg = <4>; label = "wan"; - nvmem-cells = <&macaddr_factory_24>; + nvmem-cells = <&macaddr_factory_24 0>; nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand-ubootmod.dts index d226b360e3..06b9f47453 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand-ubootmod.dts @@ -13,12 +13,12 @@ }; &gmac0 { - nvmem-cells = <&macaddr_factory_2a>; + nvmem-cells = <&macaddr_factory_2a 0>; nvmem-cell-names = "mac-address"; }; &gmac1 { - nvmem-cells = <&macaddr_factory_24>; + nvmem-cells = <&macaddr_factory_24 0>; nvmem-cell-names = "mac-address"; }; @@ -61,15 +61,22 @@ reg = <0x180000 0x200000>; compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_factory_24: macaddr@24 { - reg = <0x24 0x6>; - }; + macaddr_factory_24: macaddr@24 { + compatible = "mac-base"; + reg = <0x24 0x6>; + #nvmem-cell-cells = <1>; + }; - macaddr_factory_2a: macaddr@2a { - reg = <0x2a 0x6>; + macaddr_factory_2a: macaddr@2a { + compatible = "mac-base"; + reg = <0x2a 0x6>; + #nvmem-cell-cells = <1>; + }; }; }; diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso index 5877ca4c50..ff94a550fd 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso +++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso @@ -9,7 +9,7 @@ fragment@0 { target = <&gmac0>; __overlay__ { - nvmem-cells = <&macaddr_factory_2a>; + nvmem-cells = <&macaddr_factory_2a 0>; nvmem-cell-names = "mac-address"; }; }; @@ -17,7 +17,7 @@ fragment@1 { target = <&gmac1>; __overlay__ { - nvmem-cells = <&macaddr_factory_24>; + nvmem-cells = <&macaddr_factory_24 0>; nvmem-cell-names = "mac-address"; }; }; @@ -85,15 +85,22 @@ read-only; compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_factory_24: macaddr@24 { - reg = <0x24 0x6>; - }; + macaddr_factory_24: macaddr@24 { + compatible = "mac-base"; + reg = <0x24 0x6>; + #nvmem-cell-cells = <1>; + }; - macaddr_factory_2a: macaddr@2a { - reg = <0x2a 0x6>; + macaddr_factory_2a: macaddr@2a { + compatible = "mac-base"; + reg = <0x2a 0x6>; + #nvmem-cell-cells = <1>; + }; }; }; diff --git a/target/linux/mediatek/dts/mt7981b-jcg-q30-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-jcg-q30-ubootmod.dts index 8ec56bc71a..8e4ddf10b6 100644 --- a/target/linux/mediatek/dts/mt7981b-jcg-q30-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-jcg-q30-ubootmod.dts @@ -71,7 +71,7 @@ reg = <0>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_factory_a002a>; + nvmem-cells = <&macaddr_factory_a002a 0>; nvmem-cell-names = "mac-address"; fixed-link { @@ -139,15 +139,22 @@ reg = <0x180000 0x200000>; compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_factory_a002a: macaddr@a002a { - reg = <0xa002a 0x6>; - }; + macaddr_factory_a002a: macaddr@a002a { + compatible = "mac-base"; + reg = <0xa002a 0x6>; + #nvmem-cell-cells = <1>; + }; - macaddr_factory_a0024: macaddr@a0024 { - reg = <0xa0024 0x6>; + macaddr_factory_a0024: macaddr@a0024 { + compatible = "mac-base"; + reg = <0xa0024 0x6>; + #nvmem-cell-cells = <1>; + }; }; }; @@ -173,7 +180,7 @@ reg = <0>; label = "wan"; - nvmem-cells = <&macaddr_factory_a0024>; + nvmem-cells = <&macaddr_factory_a0024 0>; nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dts b/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dts index 8af897b9f3..3d0934c999 100644 --- a/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dts +++ b/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dts @@ -98,8 +98,8 @@ reg = <0>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_config_50707>; - nvmem-cell-names = "mac-address-ascii"; + nvmem-cells = <&macaddr_config_50707 0>; + nvmem-cell-names = "mac-address"; fixed-link { speed = <2500>; @@ -186,15 +186,22 @@ read-only; compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_config_50707: macaddr@50707 { - reg = <0x50707 0x11>; - }; + macaddr_config_50707: macaddr@50707 { + compatible = "mac-base"; + reg = <0x50707 0x11>; + #nvmem-cell-cells = <1>; + }; - macaddr_config_50787: macaddr@50787 { - reg = <0x50787 0x11>; + macaddr_config_50787: macaddr@50787 { + compatible = "mac-base"; + reg = <0x50787 0x11>; + #nvmem-cell-cells = <1>; + }; }; }; }; @@ -210,8 +217,8 @@ reg = <0>; label = "wan"; - nvmem-cells = <&macaddr_config_50787>; - nvmem-cell-names = "mac-address-ascii"; + nvmem-cells = <&macaddr_config_50787 0>; + nvmem-cell-names = "mac-address"; }; port@2 { diff --git a/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts index e3c9c9da3c..1285a5f8e0 100644 --- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts @@ -68,7 +68,7 @@ reg = <0>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_factory_14>; + nvmem-cells = <&macaddr_factory_14 0>; nvmem-cell-names = "mac-address-ascii"; fixed-link { @@ -158,13 +158,17 @@ read-only; compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_factory_14: macaddr@14 { - reg = <0x14 0x11>; + macaddr_factory_14: macaddr@14 { + compatible = "mac-base"; + reg = <0x14 0x11>; + #nvmem-cell-cells = <1>; + }; }; - }; partition@7300000 { @@ -200,9 +204,8 @@ reg = <3>; label = "wan"; - nvmem-cells = <&macaddr_factory_14>; + nvmem-cells = <&macaddr_factory_14 1>; nvmem-cell-names = "mac-address-ascii"; - mac-address-increment = <1>; }; port@6 { diff --git a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts index c6dc1e5c4e..d222cebb4f 100644 --- a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts +++ b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; #include "mt7981.dtsi"