mpc85xx: replace user space MAC with nvmem

Possible now that NVMEM supports ASCII.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-11-18 17:23:48 -08:00 committed by Christian Marangi
parent ddbe732357
commit 931fcf6189
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 27 additions and 5 deletions

View File

@ -8,11 +8,6 @@ preinit_set_mac_address() {
ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)
ip link set dev eth1 address $(mtd_get_mac_ascii cfg1 eth1addr)
;;
watchguard,firebox-t10)
ip link set dev eth0 address "$(mtd_get_mac_text "device_id" 0x1830)"
ip link set dev eth1 address "$(mtd_get_mac_text "device_id" 0x1844)"
ip link set dev eth2 address "$(mtd_get_mac_text "device_id" 0x1858)"
;;
esac
}

View File

@ -103,6 +103,24 @@
reg = <0xc0000 0x40000>;
label = "device_id";
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_device_id_1830: mac-address-hex@1830 {
reg = <0x1830 0xc>;
};
macaddr_device_id_1844: mac-address-hex@1844 {
reg = <0x1844 0xc>;
};
macaddr_device_id_1858: mac-address-hex@1858 {
reg = <0x1858 0xc>;
};
};
};
};
};
@ -147,18 +165,27 @@
enet0: ethernet@b0000 {
phy-handle = <&phy1>;
phy-connection-type = "rgmii-id";
nvmem-cells = <&macaddr_device_id_1830>;
nvmem-cell-names = "mac-address";
};
enet1: ethernet@b1000 {
tbi-handle = <&tbi_phy1>;
phy-handle = <&phy2>;
phy-connection-type = "sgmii";
nvmem-cells = <&macaddr_device_id_1844>;
nvmem-cell-names = "mac-address";
};
enet2: ethernet@b2000 {
tbi-handle = <&tbi_phy2>;
phy-handle = <&phy3>;
phy-connection-type = "sgmii";
nvmem-cells = <&macaddr_device_id_1858>;
nvmem-cell-names = "mac-address";
};
sdhc@2e000 {