mpc85xx: remove mac-address-increment

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

View File

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

View File

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

View File

@ -57,7 +57,8 @@
label = "u-boot";
read-only;
compatible = "nvmem-cells";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
@ -65,6 +66,7 @@
reg = <0x4fc00 0x6>;
};
};
};
partition@50000 {
reg = <0x00050000 0x00010000>;