aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2021-04-02 23:52:21 +0200
committerPetr Štetiar <ynezz@true.cz>2021-07-19 14:51:22 +0200
commit8ec21d6bb2101d801f1ee915d1cd0412c6585078 (patch)
treed51a7108783f926b6463f0c546db28303c411c28 /target/linux
parent293d4e61c2f500222d971fbc4b45133604638c66 (diff)
downloadupstream-8ec21d6bb2101d801f1ee915d1cd0412c6585078.tar.gz
upstream-8ec21d6bb2101d801f1ee915d1cd0412c6585078.tar.bz2
upstream-8ec21d6bb2101d801f1ee915d1cd0412c6585078.zip
mpc85xx: convert mtd-mac-address to nvmem implementation
Define nvmem-cells and convert mtd-mac-address to nvmem implementation. The conversion is done with an automated script. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts16
-rw-r--r--target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts13
2 files changed, 26 insertions, 3 deletions
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
index 10bb353683..97f5b7c7b7 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
@@ -165,7 +165,8 @@
status = "okay";
phy-handle = <&phy0>;
phy-connection-type = "rgmii-id";
- mtd-mac-address = <&hwinfo 0>;
+ nvmem-cells = <&macaddr_hwinfo_0>;
+ nvmem-cell-names = "mac-address";
};
enet1: ethernet@b1000 {
@@ -176,7 +177,8 @@
status = "okay";
phy-handle = <&phy1>;
phy-connection-type = "rgmii-id";
- mtd-mac-address = <&hwinfo 0>;
+ nvmem-cells = <&macaddr_hwinfo_0>;
+ nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
@@ -234,3 +236,13 @@
};
};
/include/ "fsl/p1020si-post.dtsi"
+
+&hwinfo {
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_hwinfo_0: macaddr@0 {
+ reg = <0x0 0x6>;
+ };
+};
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
index 29b49a9357..1976b4af96 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
@@ -119,7 +119,8 @@
enet0: ethernet@b0000 {
phy-handle = <&phy0>;
phy-connection-type = "rgmii-id";
- mtd-mac-address = <&uboot 0x4fc00>;
+ nvmem-cells = <&macaddr_uboot_4fc00>;
+ nvmem-cell-names = "mac-address";
};
enet1: ethernet@b1000 {
@@ -290,3 +291,13 @@
/delete-node/ crypto@30000; /* Pulled in by p1010si-post */
};
};
+
+&uboot {
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_uboot_4fc00: macaddr@4fc00 {
+ reg = <0x4fc00 0x6>;
+ };
+};