mediatek: use mac-base

mac-address-increment is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-11-25 14:11:08 -08:00 committed by Christian Marangi
parent 405bc5be13
commit 3eb899fd36
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
8 changed files with 32 additions and 26 deletions

View file

@ -332,7 +332,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_4: macaddr@4 { macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>; reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_factory_7fff4: macaddr@7fff4 { macaddr_factory_7fff4: macaddr@7fff4 {
@ -396,9 +398,8 @@
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x5000>; mediatek,mtd-eeprom = <&factory 0x5000>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
}; };

View file

@ -146,9 +146,8 @@
phy-connection-type = "2500base-x"; phy-connection-type = "2500base-x";
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
fixed-link { fixed-link {
speed = <2500>; speed = <2500>;
@ -274,7 +273,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_4: macaddr@4 { macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>; reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View file

@ -97,9 +97,8 @@
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 3>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
fixed-link { fixed-link {
speed = <2500>; speed = <2500>;
@ -113,9 +112,8 @@
reg = <1>; reg = <1>;
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&phy0>; phy-handle = <&phy0>;
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
mdio: mdio-bus { mdio: mdio-bus {
@ -218,7 +216,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_4: macaddr@4 { macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>; reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View file

@ -95,7 +95,7 @@
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>; nvmem-cells = <&macaddr_bdinfo_de00 0>;
fixed-link { fixed-link {
speed = <2500>; speed = <2500>;
@ -175,7 +175,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_bdinfo_de00: macaddr@de00 { macaddr_bdinfo_de00: macaddr@de00 {
compatible = "mac-base";
reg = <0xde00 0x6>; reg = <0xde00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -233,8 +235,7 @@
label = "wan"; label = "wan";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>; nvmem-cells = <&macaddr_bdinfo_de00 1>;
mac-address-increment = <1>;
}; };
lan1: port@1 { lan1: port@1 {
@ -242,7 +243,7 @@
label = "lan1"; label = "lan1";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>; nvmem-cells = <&macaddr_bdinfo_de00 0>;
}; };
port@2 { port@2 {
@ -250,7 +251,7 @@
label = "lan2"; label = "lan2";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>; nvmem-cells = <&macaddr_bdinfo_de00 0>;
}; };
port@3 { port@3 {
@ -258,7 +259,7 @@
label = "lan3"; label = "lan3";
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_bdinfo_de00>; nvmem-cells = <&macaddr_bdinfo_de00 0>;
}; };
port@6 { port@6 {

View file

@ -91,7 +91,7 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
phy-handle = <&phy0>; phy-handle = <&phy0>;
nvmem-cells = <&macaddr>; nvmem-cells = <&macaddr 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -100,9 +100,8 @@
reg = <1>; reg = <1>;
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&int_gbe_phy>; phy-handle = <&int_gbe_phy>;
nvmem-cells = <&macaddr>; nvmem-cells = <&macaddr 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
}; };
@ -185,7 +184,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr: macaddr@a { macaddr: macaddr@a {
compatible = "mac-base";
reg = <0xa 0x6>; reg = <0xa 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View file

@ -73,9 +73,8 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
fixed-link { fixed-link {
speed = <2500>; speed = <2500>;
@ -183,7 +182,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_4: macaddr@4 { macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>; reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

View file

@ -95,7 +95,7 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_config_1c>; nvmem-cells = <&macaddr_config_1c 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
fixed-link { fixed-link {
@ -111,9 +111,8 @@
phy-handle = <&phy7>; phy-handle = <&phy7>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_config_1c>; nvmem-cells = <&macaddr_config_1c 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
mdio: mdio-bus { mdio: mdio-bus {
@ -189,7 +188,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_1c: macaddr@1c { macaddr_config_1c: macaddr@1c {
compatible = "mac-base";
reg = <0x1c 0x6>; reg = <0x1c 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -263,8 +264,7 @@
&wifi { &wifi {
mediatek,mtd-eeprom = <&factory 0x0>; mediatek,mtd-eeprom = <&factory 0x0>;
nvmem-cells = <&macaddr_config_1c>; nvmem-cells = <&macaddr_config_1c 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
status = "okay"; status = "okay";
}; };

View file

@ -54,9 +54,8 @@
reg = <0>; reg = <0>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
fixed-link { fixed-link {
speed = <2500>; speed = <2500>;
@ -173,7 +172,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_4: macaddr@4 { macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>; reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };