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

mpc85xx: 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:57:43 -08:00 committed by Christian Marangi
parent 2ed2b8b16c
commit ddbe732357
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
3 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts
View file

@ -87,12 +87,16 @@
label = "hw-info"; label = "hw-info";
read-only; read-only;
compatible = "nvmem-cells"; nvmem-layout {
#address-cells = <1>; compatible = "fixed-layout";
#size-cells = <1>; #address-cells = <1>;
#size-cells = <1>;
macaddr_hwinfo_0: macaddr@0 { macaddr_hwinfo_0: macaddr@0 {
reg = <0x0 0x6>; compatible = "mac-base";
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
}; };
}; };
@ -167,43 +171,39 @@
reg = <1>; reg = <1>;
label = "lan1"; label = "lan1";
phy-handle = <&phy_port1>; phy-handle = <&phy_port1>;
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 2>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
}; };
port@2 { port@2 {
reg = <2>; reg = <2>;
label = "lan2"; label = "lan2";
phy-handle = <&phy_port2>; phy-handle = <&phy_port2>;
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 3>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
}; };
port@3 { port@3 {
reg = <3>; reg = <3>;
label = "lan3"; label = "lan3";
phy-handle = <&phy_port3>; phy-handle = <&phy_port3>;
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 4>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
}; };
port@4 { port@4 {
reg = <4>; reg = <4>;
label = "lan4"; label = "lan4";
phy-handle = <&phy_port4>; phy-handle = <&phy_port4>;
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 5>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <5>;
}; };
port@5 { port@5 {
reg = <5>; reg = <5>;
label = "wan"; label = "wan";
phy-handle = <&phy_port5>; phy-handle = <&phy_port5>;
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -232,7 +232,7 @@
enet0: ethernet@b0000 { enet0: ethernet@b0000 {
status = "okay"; status = "okay";
phy-connection-type = "rgmii-id"; phy-connection-type = "rgmii-id";
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
fixed-link { fixed-link {
@ -286,9 +286,8 @@
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 16>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <16>;
}; };
}; };
}; };

19
target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
View file

@ -76,12 +76,16 @@
label = "hw-info"; label = "hw-info";
read-only; read-only;
compatible = "nvmem-cells"; nvmem-layout {
#address-cells = <1>; compatible = "fixed-layout";
#size-cells = <1>; #address-cells = <1>;
#size-cells = <1>;
macaddr_hwinfo_0: macaddr@0 { macaddr_hwinfo_0: macaddr@0 {
reg = <0x0 0x6>; compatible = "mac-base";
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
}; };
}; };
@ -229,7 +233,7 @@
status = "okay"; status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-connection-type = "rgmii-id"; phy-connection-type = "rgmii-id";
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 0>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
}; };
@ -241,9 +245,8 @@
status = "okay"; status = "okay";
phy-handle = <&phy1>; phy-handle = <&phy1>;
phy-connection-type = "rgmii-id"; phy-connection-type = "rgmii-id";
nvmem-cells = <&macaddr_hwinfo_0>; nvmem-cells = <&macaddr_hwinfo_0 1>;
nvmem-cell-names = "mac-address"; nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
}; };
gpio0: gpio-controller@fc00 { gpio0: gpio-controller@fc00 {

12
target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
View file

@ -57,12 +57,14 @@
label = "u-boot"; label = "u-boot";
read-only; read-only;
compatible = "nvmem-cells"; nvmem-layout {
#address-cells = <1>; compatible = "fixed-layout";
#size-cells = <1>; #address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_4fc00: macaddr@4fc00 { macaddr_uboot_4fc00: macaddr@4fc00 {
reg = <0x4fc00 0x6>; reg = <0x4fc00 0x6>;
};
}; };
}; };