ramips: mt7628: 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-23 18:59:35 -08:00 committed by Christian Marangi
parent 0a1d15642f
commit e8084a3c3b
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
26 changed files with 115 additions and 55 deletions

View file

@ -88,7 +88,9 @@
}; };
macaddr_factory_8004: macaddr@8004 { macaddr_factory_8004: macaddr@8004 {
compatible = "mac-base";
reg = <0x8004 0x6>; reg = <0x8004 0x6>;
#nvmem-cell-cells = <1>;
}; };
macaddr_factory_e000: macaddr@e000 { macaddr_factory_e000: macaddr@e000 {
@ -115,9 +117,8 @@
compatible = "mediatek,mt76"; compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004>; nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };
}; };

View file

@ -96,7 +96,9 @@
}; };
macaddr_factory_28: macaddr@28 { macaddr_factory_28: macaddr@28 {
compatible = "mac-base";
reg = <0x28 0x6>; reg = <0x28 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -126,7 +128,7 @@
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_factory_28>; nvmem-cells = <&macaddr_factory_28 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -144,9 +146,8 @@
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28>; nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28 3>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <3>;
}; };
}; };
@ -164,8 +165,7 @@
&wmac { &wmac {
status = "okay"; status = "okay";
nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28>; nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };

View file

@ -86,7 +86,9 @@
}; };
macaddr_factory_4: macaddr@4 { macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>; reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -120,9 +122,8 @@
}; };
&ethernet { &ethernet {
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)>;
}; };
&esw { &esw {

View file

@ -44,7 +44,6 @@
}; };
&wifi5 { &wifi5 {
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(2)>;
}; };

View file

@ -98,7 +98,9 @@
}; };
macaddr_factory_4: macaddr@4 { macaddr_factory_4: macaddr@4 {
compatible = "mac-base";
reg = <0x4 0x6>; reg = <0x4 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -120,7 +122,7 @@
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View file

@ -63,7 +63,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_rom_f100: macaddr@f100 { macaddr_rom_f100: macaddr@f100 {
compatible = "mac-base";
reg = <0xf100 0x6>; reg = <0xf100 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -99,12 +101,12 @@
&wmac { &wmac {
status = "okay"; status = "okay";
nvmem-cells = <&eeprom_radio_0>, <&macaddr_rom_f100>; nvmem-cells = <&eeprom_radio_0>, <&macaddr_rom_f100 0>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_rom_f100>; nvmem-cells = <&macaddr_rom_f100 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View file

@ -55,7 +55,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_factory_f100: macaddr@f100 { macaddr_factory_f100: macaddr@f100 {
compatible = "mac-base";
reg = <0xf100 0x6>; reg = <0xf100 0x6>;
#nvmem-cell-cells = <1>;
}; };
eeprom_factory_20000: eeprom@20000 { eeprom_factory_20000: eeprom@20000 {
@ -71,14 +73,7 @@
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100>;
nvmem-cell-names = "eeprom", "mac-address";
};
&ethernet { &ethernet {
nvmem-cells = <&macaddr_factory_f100>; nvmem-cells = <&macaddr_factory_f100 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View file

@ -78,7 +78,10 @@
}; };
&wmac { &wmac {
mac-address-increment = <(-2)>; status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 (-2)>;
nvmem-cell-names = "eeprom", "mac-address";
}; };
&esw { &esw {
@ -100,8 +103,7 @@
mt76@0,0 { mt76@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>; nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-1)>;
}; };
}; };

View file

@ -95,8 +95,7 @@
wifi@0,0 { wifi@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>; nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-1)>;
}; };
}; };

View file

@ -83,6 +83,13 @@
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};
&esw { &esw {
mediatek,portmap = <0x3e>; mediatek,portmap = <0x3e>;
}; };
@ -95,8 +102,7 @@
mt76@0,0 { mt76@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>; nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-1)>;
}; };
}; };

View file

@ -93,8 +93,7 @@
wifi@0,0 { wifi@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>; nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-1)>;
}; };
}; };

View file

@ -88,9 +88,8 @@
wifi@0,0 { wifi@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100>; nvmem-cells = <&eeprom_radio_8000>, <&macaddr_rom_f100 (-1)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-1)>;
}; };
}; };

View file

@ -106,7 +106,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_2008: macaddr@2008 { macaddr_config_2008: macaddr@2008 {
compatible = "mac-base";
reg = <0x2008 0x6>; reg = <0x2008 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -143,16 +145,15 @@
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_config_2008>; nvmem-cells = <&macaddr_config_2008 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&wmac { &wmac {
status = "okay"; status = "okay";
nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008>; nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008 1>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <1>;
}; };
&pcie { &pcie {
@ -163,8 +164,7 @@
mt76@0,0 { mt76@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008>; nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };
}; };

View file

@ -43,7 +43,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_10008: macaddr@10008 { macaddr_config_10008: macaddr@10008 {
compatible = "mac-base";
reg = <0x10008 0x6>; reg = <0x10008 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -77,18 +79,16 @@
}; };
&wlan5g { &wlan5g {
nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008>; nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_10008 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };
&wmac { &wmac {
nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008>; nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008 1>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <1>;
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_config_10008>; nvmem-cells = <&macaddr_config_10008 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View file

@ -43,7 +43,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_2008: macaddr@2008 { macaddr_config_2008: macaddr@2008 {
compatible = "mac-base";
reg = <0x2008 0x6>; reg = <0x2008 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -72,18 +74,16 @@
}; };
&wlan5g { &wlan5g {
nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008>; nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_2008 (-2)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-2)>;
}; };
&wmac { &wmac {
nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008>; nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008 (-1)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-1)>;
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_config_2008>; nvmem-cells = <&macaddr_config_2008 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };

View file

@ -76,6 +76,13 @@
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};
&esw { &esw {
mediatek,portmap = <0x3e>; mediatek,portmap = <0x3e>;
}; };

View file

@ -73,3 +73,10 @@
function = "gpio"; function = "gpio";
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};

View file

@ -49,6 +49,13 @@
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_factory_f100>; nvmem-cells = <&macaddr_factory_f100 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};

View file

@ -66,6 +66,13 @@
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};
&esw { &esw {
mediatek,portmap = <0x3e>; mediatek,portmap = <0x3e>;
}; };

View file

@ -92,6 +92,13 @@
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};
&esw { &esw {
mediatek,portmap = <0x3e>; mediatek,portmap = <0x3e>;
}; };

View file

@ -76,6 +76,13 @@
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};
&esw { &esw {
mediatek,portmap = <0x3e>; mediatek,portmap = <0x3e>;
}; };

View file

@ -69,6 +69,13 @@
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};
&esw { &esw {
mediatek,portmap = <0x3e>; mediatek,portmap = <0x3e>;
}; };

View file

@ -83,6 +83,13 @@
}; };
}; };
&wmac {
status = "okay";
nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
};
&pcie { &pcie {
status = "okay"; status = "okay";
}; };
@ -91,8 +98,7 @@
mt76@0,0 { mt76@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100>; nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-1)>;
}; };
}; };

View file

@ -65,7 +65,9 @@
}; };
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_28: macaddr@28 { macaddr_factory_28: macaddr@28 {

View file

@ -64,9 +64,8 @@
}; };
&ethernet { &ethernet {
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)>;
}; };
&esw { &esw {

View file

@ -64,9 +64,8 @@
}; };
&ethernet { &ethernet {
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)>;
}; };
&esw { &esw {