Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mvebu: remove mac-address-increment

Browse source 
It's deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-11-10 18:52:20 -08:00 committed by Christian Marangi
parent aaeb379023
commit 944d3526a3
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
6 changed files with 43 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
target/linux/mvebu/files/arch/arm/boot/dts/armada-380-iij-sa-w2.dts
View file

@ -352,7 +352,6 @@
}; };
partition@110000 { partition@110000 {
compatible = "nvmem-cells";
reg = <0x110000 0xf0000>; reg = <0x110000 0xf0000>;
label = "board_info"; label = "board_info";
read-only; read-only;

15
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts
View file

@ -52,41 +52,36 @@
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "wan"; label = "wan";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
port@1 { port@1 {
reg = <1>; reg = <1>;
label = "lan4"; label = "lan4";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 5>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <5>;
}; };
port@2 { port@2 {
reg = <2>; reg = <2>;
label = "lan3"; label = "lan3";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 4>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
}; };
port@3 { port@3 {
reg = <3>; reg = <3>;
label = "lan2"; label = "lan2";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 3>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
}; };
port@4 { port@4 {
reg = <4>; reg = <4>;
label = "lan1"; label = "lan1";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };
port@6 { port@6 {

21
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts
View file

@ -56,9 +56,8 @@
phy-connection-type = "sgmii"; phy-connection-type = "sgmii";
buffer-manager = <&bm>; buffer-manager = <&bm>;
bm,pool-long = <2>; bm,pool-long = <2>;
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
&eth2 { &eth2 {
@ -68,9 +67,8 @@
phy-connection-type = "sgmii"; phy-connection-type = "sgmii";
buffer-manager = <&bm>; buffer-manager = <&bm>;
bm,pool-long = <3>; bm,pool-long = <3>;
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };
&mdio { &mdio {
@ -126,41 +124,36 @@
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "lan5"; label = "lan5";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 7>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <7>;
}; };
port@1 { port@1 {
reg = <1>; reg = <1>;
label = "lan4"; label = "lan4";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 6>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <6>;
}; };
port@2 { port@2 {
reg = <2>; reg = <2>;
label = "lan3"; label = "lan3";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 5>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <5>;
}; };
port@3 { port@3 {
reg = <3>; reg = <3>;
label = "lan2"; label = "lan2";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 4>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
}; };
port@4 { port@4 {
reg = <4>; reg = <4>;
label = "lan1"; label = "lan1";
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 3>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
}; };
port@6 { port@6 {

8
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi
View file

@ -211,7 +211,7 @@
buffer-manager = <&bm>; buffer-manager = <&bm>;
bm,pool-long = <0>; bm,pool-long = <0>;
bm,pool-short = <1>; bm,pool-short = <1>;
nvmem-cells = <&macaddr_bdinfo_d880>; nvmem-cells = <&macaddr_bdinfo_d880 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
fixed-link { fixed-link {
@ -285,12 +285,16 @@
label = "board-info"; label = "board-info";
read-only; read-only;
compatible = "nvmem-cells"; nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
macaddr_bdinfo_d880: macaddr@d880 { macaddr_bdinfo_d880: macaddr@d880 {
compatible = "mac-base";
reg = <0xd880 0x6>; reg = <0xd880 0x6>;
#nvmem-cell-cells = <1>;
};
}; };
}; };

4
target/linux/mvebu/files/arch/arm/boot/dts/armada-385-nas1dual.dts
View file

@ -252,7 +252,8 @@
label = "u-boot"; label = "u-boot";
read-only; read-only;
compatible = "nvmem-cells"; nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -260,6 +261,7 @@
reg = <0xfffa8 0x6>; reg = <0xfffa8 0x6>;
}; };
}; };
};
partition@100000 { partition@100000 {
reg = <0x00100000 0x03ec0000>; reg = <0x00100000 0x03ec0000>;

28
target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
View file

@ -104,6 +104,20 @@
label = "factory"; label = "factory";
reg = <0xf8000 0x8000>; reg = <0xf8000 0x8000>;
read-only; read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_factory_6: macaddr@6 {
reg = <0x6 0x6>;
};
};
}; };
partition@100000 { partition@100000 {
@ -231,17 +245,3 @@
full-duplex; full-duplex;
}; };
}; };
&factory {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_factory_6: macaddr@6 {
reg = <0x6 0x6>;
};
};