ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-20 11:39:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ramips: mt7620a: use mac-base

Browse Source 
mac-address-increment is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-11-25 13:35:04 -08:00 committed by Christian Marangi
parent 40feb97e56
commit 458cb2cd6b
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
16 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/ramips/dts/mt7620a_cameo_810.dtsi
View File

@ -99,7 +99,9 @@
}; };
macaddr_factory_28: macaddr@28 { macaddr_factory_28: macaddr@28 {
compatible = "mac-base";
reg = <0x28 0x6>; reg = <0x28 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -145,7 +147,7 @@
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_factory_28>; nvmem-cells = <&macaddr_factory_28 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mediatek,portmap = "llllw"; mediatek,portmap = "llllw";
@ -159,7 +161,7 @@
pinctrl-names = "default", "pa_gpio"; pinctrl-names = "default", "pa_gpio";
pinctrl-0 = <&pa_pins>; pinctrl-0 = <&pa_pins>;
pinctrl-1 = <&pa_gpio_pins>; pinctrl-1 = <&pa_gpio_pins>;
nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28>; nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28 0>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
}; };
@ -171,8 +173,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_factory_8000>, <&macaddr_factory_28>; nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };
}; };

5
target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
View File

@ -108,7 +108,9 @@
}; };
macaddr_config_e490: macaddr@e490 { macaddr_config_e490: macaddr@e490 {
compatible = "mac-base";
reg = <0xe490 0x6>; reg = <0xe490 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -131,9 +133,8 @@
&pcie0 { &pcie0 {
mt76x0e@0,0 { mt76x0e@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&eeprom_config_e05d>, <&macaddr_config_e490>; nvmem-cells = <&eeprom_config_e05d>, <&macaddr_config_e490 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(2)>;
}; };
}; };

13
target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts
View File

@ -109,11 +109,15 @@
}; };
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_8004: macaddr@8004 { macaddr_factory_8004: macaddr@8004 {
compatible = "mac-base";
reg = <0x8004 0x6>; reg = <0x8004 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -136,9 +140,8 @@
}; };
&ethernet { &ethernet {
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)>;
}; };
&wmac { &wmac {
@ -146,9 +149,8 @@
pinctrl-0 = <&pa_pins>; pinctrl-0 = <&pa_pins>;
pinctrl-1 = <&pa_gpio_pins>; pinctrl-1 = <&pa_gpio_pins>;
nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4>; nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4 (-1)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-1)>;
}; };
&pcie { &pcie {
@ -159,9 +161,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_factory_8000>, <&macaddr_factory_8004>; nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004 (-3)>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(-3)>;
led { led {
led-active-low; led-active-low;

5
target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
View File

@ -129,7 +129,9 @@
}; };
macaddr_config_e496: macaddr@e496 { macaddr_config_e496: macaddr@e496 {
compatible = "mac-base";
reg = <0xe496 0x6>; reg = <0xe496 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -159,9 +161,8 @@
&pcie0 { &pcie0 {
wifi@0,0 { wifi@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&eeprom_config_e083>, <&macaddr_config_e496>; nvmem-cells = <&eeprom_config_e083>, <&macaddr_config_e496 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <(2)>;
led { led {
led-sources = <0>; led-sources = <0>;

5
target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
View File

@ -122,7 +122,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_config_e4a8: macaddr@e4a8 { macaddr_config_e4a8: macaddr@e4a8 {
compatible = "mac-base";
reg = <0xe4a8 0x6>; reg = <0xe4a8 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -153,9 +155,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 = <&macaddr_config_e4a8>; nvmem-cells = <&macaddr_config_e4a8 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(2)>;
led { led {
led-sources = <2>; led-sources = <2>;

3
target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts
View File

@ -30,7 +30,6 @@
}; };
&wifi { &wifi {
nvmem-cells = <&eeprom_config_e08e>, <&macaddr_config_e50e>; nvmem-cells = <&eeprom_config_e08e>, <&macaddr_config_e50e 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };

3
target/linux/ramips/dts/mt7620a_dlink_dwr-961-a1.dts
View File

@ -58,7 +58,6 @@
}; };
&wifi { &wifi {
nvmem-cells = <&eeprom_config_e29e>, <&macaddr_config_e50e>; nvmem-cells = <&eeprom_config_e29e>, <&macaddr_config_e50e 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };

2
target/linux/ramips/dts/mt7620a_dlink_dwr-96x.dtsi
View File

@ -169,7 +169,9 @@
}; };
macaddr_config_e50e: macaddr@e50e { macaddr_config_e50e: macaddr@e50e {
compatible = "mac-base";
reg = <0xe50e 0x6>; reg = <0xe50e 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };

9
target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
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>;
}; };
}; };
}; };
@ -140,7 +142,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rgmii1_pins &mdio_pins &phy_reset_pins>; pinctrl-0 = <&rgmii1_pins &mdio_pins &phy_reset_pins>;
nvmem-cells = <&macaddr_factory_4>; nvmem-cells = <&macaddr_factory_4 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
phy-reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; phy-reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
@ -192,7 +194,7 @@
}; };
&wmac { &wmac {
nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4>; nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4 0>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
}; };
@ -204,8 +206,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_factory_8000>, <&macaddr_factory_4>; nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_4 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };
}; };

5
target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
View File

@ -106,7 +106,9 @@
}; };
macaddr_config_e07e: macaddr@e07e { macaddr_config_e07e: macaddr@e07e {
compatible = "mac-base";
reg = <0xe07e 0x6>; reg = <0xe07e 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -164,9 +166,8 @@
&pcie0 { &pcie0 {
mt76x0e@0,0 { mt76x0e@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
nvmem-cells = <&eeprom_config_e08a>, <&macaddr_config_e07e>; nvmem-cells = <&eeprom_config_e08a>, <&macaddr_config_e07e 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };
}; };

9
target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
View File

@ -116,7 +116,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>;
}; };
}; };
}; };
@ -154,7 +156,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>; pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
nvmem-cells = <&macaddr_rom_f100>; nvmem-cells = <&macaddr_rom_f100 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
port@5 { port@5 {
@ -188,7 +190,7 @@
}; };
&wmac { &wmac {
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";
}; };
@ -207,8 +209,7 @@
&pcie0 { &pcie0 {
mt76@0,0 { mt76@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
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)>;
}; };
}; };

6
target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
View File

@ -73,13 +73,11 @@
pinctrl-0 = <&pa_pins>; pinctrl-0 = <&pa_pins>;
pinctrl-1 = <&pa_gpio_pins>; pinctrl-1 = <&pa_gpio_pins>;
nvmem-cells = <&macaddr_rom_f100>; nvmem-cells = <&macaddr_rom_f100 (-2)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
}; };
&wifi { &wifi {
nvmem-cells = <&macaddr_rom_f100>; nvmem-cells = <&macaddr_rom_f100 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };

5
target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
View File

@ -53,12 +53,11 @@
}; };
&wmac { &wmac {
nvmem-cells = <&macaddr_rom_f100>; nvmem-cells = <&macaddr_rom_f100 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&wifi { &wifi {
nvmem-cells = <&macaddr_rom_f100>; nvmem-cells = <&macaddr_rom_f100 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };

6
target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
View File

@ -73,13 +73,11 @@
pinctrl-0 = <&pa_pins>; pinctrl-0 = <&pa_pins>;
pinctrl-1 = <&pa_gpio_pins>; pinctrl-1 = <&pa_gpio_pins>;
nvmem-cells = <&macaddr_rom_f100>; nvmem-cells = <&macaddr_rom_f100 (-2)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
}; };
&wifi { &wifi {
nvmem-cells = <&macaddr_rom_f100>; nvmem-cells = <&macaddr_rom_f100 (-1)>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
}; };

2
target/linux/ramips/dts/mt7620a_tplink_archer.dtsi
View File

@ -79,7 +79,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>;
}; };
}; };
}; };

9
target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
View File

@ -55,7 +55,9 @@
#size-cells = <1>; #size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 { macaddr_uboot_1fc00: macaddr@1fc00 {
compatible = "mac-base";
reg = <0x1fc00 0x6>; reg = <0x1fc00 0x6>;
#nvmem-cell-cells = <1>;
}; };
}; };
}; };
@ -96,12 +98,12 @@
}; };
&ethernet { &ethernet {
nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cells = <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
&wmac { &wmac {
nvmem-cells = <&eeprom_radio_0>, <&macaddr_uboot_1fc00>; nvmem-cells = <&eeprom_radio_0>, <&macaddr_uboot_1fc00 0>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
}; };
@ -113,8 +115,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_uboot_1fc00>; nvmem-cells = <&eeprom_radio_8000>, <&macaddr_uboot_1fc00 2>;
nvmem-cell-names = "eeprom", "mac-address"; nvmem-cell-names = "eeprom", "mac-address";
mac-address-increment = <2>;
}; };
}; };