From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Fri, 20 Aug 2021 12:27:13 +0000 (+0200)
Subject: lantiq: convert mtd-mac-address to nvmem for Fritz!Box 736x
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=adb3e46616c69472964bfc0763ff622f468cb2ff;p=openwrt%2Fstaging%2Fjow.git

lantiq: convert mtd-mac-address to nvmem for Fritz!Box 736x

Convert this series by moving the definitions to the individual
devices.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
index 3bd6ff0ee7..8881745819 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
@@ -51,3 +51,19 @@
 		};
 	};
 };
+
+&eth0 {
+	nvmem-cells = <&macaddr_urlader_a91>;
+	nvmem-cell-names = "mac-address";
+	mac-address-increment = <(-2)>;
+};
+
+&urlader {
+	compatible = "nvmem-cells";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	macaddr_urlader_a91: macaddr@a91 {
+		reg = <0xa91 0x6>;
+	};
+};
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
index 898ca00c34..945c553688 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
@@ -51,3 +51,19 @@
 		};
 	};
 };
+
+&eth0 {
+	nvmem-cells = <&macaddr_urlader_a91>;
+	nvmem-cell-names = "mac-address";
+	mac-address-increment = <(-2)>;
+};
+
+&urlader {
+	compatible = "nvmem-cells";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	macaddr_urlader_a91: macaddr@a91 {
+		reg = <0xa91 0x6>;
+	};
+};
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
index c26908642c..b1423e5dea 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
@@ -83,3 +83,19 @@
 		#address-cells = <2>;
 	};
 };
+
+&eth0 {
+	nvmem-cells = <&macaddr_urlader_a91>;
+	nvmem-cell-names = "mac-address";
+	mac-address-increment = <(-2)>;
+};
+
+&urlader {
+	compatible = "nvmem-cells";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	macaddr_urlader_a91: macaddr@a91 {
+		reg = <0xa91 0x6>;
+	};
+};
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
index d91dc74e2f..83ef415423 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
@@ -80,11 +80,6 @@
 	};
 };
 
-&eth0 {
-	mtd-mac-address = <&urlader 0xa91>;
-	mac-address-increment = <(-2)>;
-};
-
 &gphy0 {
 	lantiq,gphy-mode = <GPHY_MODE_GE>;
 };