mediatek: switch to new nvmem fixed-layout binding

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-11-04 13:05:10 +08:00
parent 893a99e665
commit aad7035924
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
9 changed files with 120 additions and 72 deletions

View File

@ -87,8 +87,8 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_art_7c>; nvmem-cells = <&macaddr_art_7c 0>;
nvmem-cell-names = "mac-address-ascii"; nvmem-cell-names = "mac-address";
fixed-link { fixed-link {
speed = <2500>; speed = <2500>;
@ -103,8 +103,8 @@
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&int_gbe_phy>; phy-handle = <&int_gbe_phy>;
nvmem-cells = <&macaddr_art_7c>; nvmem-cells = <&macaddr_art_7c 0>;
nvmem-cell-names = "mac-address-ascii"; nvmem-cell-names = "mac-address";
}; };
}; };
@ -167,11 +167,16 @@
read-only; read-only;
compatible = "nvmem-cells"; compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_art_7c: macaddr@7c { macaddr_art_7c: macaddr@7c {
compatible = "mac-base";
reg = <0x7c 0x11>; reg = <0x7c 0x11>;
#nvmem-cell-cells = <1>;
};
}; };
}; };

View File

@ -71,8 +71,8 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_art_7b>; nvmem-cells = <&macaddr_art_7b 0>;
nvmem-cell-names = "mac-address-ascii"; nvmem-cell-names = "mac-address";
fixed-link { fixed-link {
speed = <2500>; speed = <2500>;
@ -140,11 +140,16 @@
reg = <0x180000 0x100000>; reg = <0x180000 0x100000>;
compatible = "nvmem-cells"; compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_art_7b: macaddr@7b { macaddr_art_7b: macaddr@7b {
compatible = "mac-base";
reg = <0x7b 0x11>; reg = <0x7b 0x11>;
#nvmem-cell-cells = <1>;
};
}; };
}; };
@ -191,9 +196,8 @@
reg = <3>; reg = <3>;
label = "wan"; label = "wan";
nvmem-cells = <&macaddr_art_7b>; nvmem-cells = <&macaddr_art_7b 3>;
nvmem-cell-names = "mac-address-ascii"; nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
}; };
port@6 { port@6 {

View File

@ -73,7 +73,7 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_factory_2a>; nvmem-cells = <&macaddr_factory_2a 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
fixed-link { fixed-link {
@ -135,15 +135,22 @@
reg = <0x180000 0x200000>; reg = <0x180000 0x200000>;
compatible = "nvmem-cells"; compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_24: macaddr@24 { macaddr_factory_24: macaddr@24 {
compatible = "mac-base";
reg = <0x24 0x6>; reg = <0x24 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_factory_2a: macaddr@2a { macaddr_factory_2a: macaddr@2a {
compatible = "mac-base";
reg = <0x2a 0x6>; reg = <0x2a 0x6>;
#nvmem-cell-cells = <1>;
};
}; };
}; };
@ -184,7 +191,7 @@
reg = <4>; reg = <4>;
label = "wan"; label = "wan";
nvmem-cells = <&macaddr_factory_24>; nvmem-cells = <&macaddr_factory_24 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -13,12 +13,12 @@
}; };
&gmac0 { &gmac0 {
nvmem-cells = <&macaddr_factory_2a>; nvmem-cells = <&macaddr_factory_2a 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&gmac1 { &gmac1 {
nvmem-cells = <&macaddr_factory_24>; nvmem-cells = <&macaddr_factory_24 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -61,15 +61,22 @@
reg = <0x180000 0x200000>; reg = <0x180000 0x200000>;
compatible = "nvmem-cells"; compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_24: macaddr@24 { macaddr_factory_24: macaddr@24 {
compatible = "mac-base";
reg = <0x24 0x6>; reg = <0x24 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_factory_2a: macaddr@2a { macaddr_factory_2a: macaddr@2a {
compatible = "mac-base";
reg = <0x2a 0x6>; reg = <0x2a 0x6>;
#nvmem-cell-cells = <1>;
};
}; };
}; };

View File

@ -9,7 +9,7 @@
fragment@0 { fragment@0 {
target = <&gmac0>; target = <&gmac0>;
__overlay__ { __overlay__ {
nvmem-cells = <&macaddr_factory_2a>; nvmem-cells = <&macaddr_factory_2a 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
}; };
@ -17,7 +17,7 @@
fragment@1 { fragment@1 {
target = <&gmac1>; target = <&gmac1>;
__overlay__ { __overlay__ {
nvmem-cells = <&macaddr_factory_24>; nvmem-cells = <&macaddr_factory_24 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
}; };
@ -85,15 +85,22 @@
read-only; read-only;
compatible = "nvmem-cells"; compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_24: macaddr@24 { macaddr_factory_24: macaddr@24 {
compatible = "mac-base";
reg = <0x24 0x6>; reg = <0x24 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_factory_2a: macaddr@2a { macaddr_factory_2a: macaddr@2a {
compatible = "mac-base";
reg = <0x2a 0x6>; reg = <0x2a 0x6>;
#nvmem-cell-cells = <1>;
};
}; };
}; };

View File

@ -71,7 +71,7 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_factory_a002a>; nvmem-cells = <&macaddr_factory_a002a 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
fixed-link { fixed-link {
@ -139,15 +139,22 @@
reg = <0x180000 0x200000>; reg = <0x180000 0x200000>;
compatible = "nvmem-cells"; compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_a002a: macaddr@a002a { macaddr_factory_a002a: macaddr@a002a {
compatible = "mac-base";
reg = <0xa002a 0x6>; reg = <0xa002a 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_factory_a0024: macaddr@a0024 { macaddr_factory_a0024: macaddr@a0024 {
compatible = "mac-base";
reg = <0xa0024 0x6>; reg = <0xa0024 0x6>;
#nvmem-cell-cells = <1>;
};
}; };
}; };
@ -173,7 +180,7 @@
reg = <0>; reg = <0>;
label = "wan"; label = "wan";
nvmem-cells = <&macaddr_factory_a0024>; nvmem-cells = <&macaddr_factory_a0024 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View File

@ -98,8 +98,8 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_config_50707>; nvmem-cells = <&macaddr_config_50707 0>;
nvmem-cell-names = "mac-address-ascii"; nvmem-cell-names = "mac-address";
fixed-link { fixed-link {
speed = <2500>; speed = <2500>;
@ -186,15 +186,22 @@
read-only; read-only;
compatible = "nvmem-cells"; compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_config_50707: macaddr@50707 { macaddr_config_50707: macaddr@50707 {
compatible = "mac-base";
reg = <0x50707 0x11>; reg = <0x50707 0x11>;
#nvmem-cell-cells = <1>;
}; };
macaddr_config_50787: macaddr@50787 { macaddr_config_50787: macaddr@50787 {
compatible = "mac-base";
reg = <0x50787 0x11>; reg = <0x50787 0x11>;
#nvmem-cell-cells = <1>;
};
}; };
}; };
}; };
@ -210,8 +217,8 @@
reg = <0>; reg = <0>;
label = "wan"; label = "wan";
nvmem-cells = <&macaddr_config_50787>; nvmem-cells = <&macaddr_config_50787 0>;
nvmem-cell-names = "mac-address-ascii"; nvmem-cell-names = "mac-address";
}; };
port@2 { port@2 {

View File

@ -68,7 +68,7 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_factory_14>; nvmem-cells = <&macaddr_factory_14 0>;
nvmem-cell-names = "mac-address-ascii"; nvmem-cell-names = "mac-address-ascii";
fixed-link { fixed-link {
@ -158,13 +158,17 @@
read-only; read-only;
compatible = "nvmem-cells"; compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_14: macaddr@14 { macaddr_factory_14: macaddr@14 {
compatible = "mac-base";
reg = <0x14 0x11>; reg = <0x14 0x11>;
#nvmem-cell-cells = <1>;
};
}; };
}; };
partition@7300000 { partition@7300000 {
@ -200,9 +204,8 @@
reg = <3>; reg = <3>;
label = "wan"; label = "wan";
nvmem-cells = <&macaddr_factory_14>; nvmem-cells = <&macaddr_factory_14 1>;
nvmem-cell-names = "mac-address-ascii"; nvmem-cell-names = "mac-address-ascii";
mac-address-increment = <1>;
}; };
port@6 { port@6 {

View File

@ -1,3 +1,4 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/dts-v1/; /dts-v1/;
#include "mt7981.dtsi" #include "mt7981.dtsi"