From c56104b985f01909c81d8dc5c126577615da91c8 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Thu, 7 Sep 2023 09:06:12 +0800
Subject: [PATCH] ramips: fix reference of factory node for jcg q20

Fixes: #1056

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts | 12 ++++++++++++
 target/linux/ramips/dts/mt7621_jcg_q20.dts         | 12 ++++++++++++
 target/linux/ramips/dts/mt7621_jcg_q20.dtsi        | 14 --------------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts b/target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts
index a9670b4a17..86899b39d9 100644
--- a/target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts
+++ b/target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts
@@ -29,6 +29,18 @@
 		label = "Factory";
 		reg = <0x100000 0x80000>;
 		read-only;
+
+		compatible = "nvmem-cells";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		macaddr_factory_3fff4: macaddr@3fff4 {
+			reg = <0x3fff4 0x6>;
+		};
+
+		macaddr_factory_3fffa: macaddr@3fffa {
+			reg = <0x3fffa 0x6>;
+		};
 	};
 
 	partition@180000 {
diff --git a/target/linux/ramips/dts/mt7621_jcg_q20.dts b/target/linux/ramips/dts/mt7621_jcg_q20.dts
index 707e9617dc..c5bf769aa2 100644
--- a/target/linux/ramips/dts/mt7621_jcg_q20.dts
+++ b/target/linux/ramips/dts/mt7621_jcg_q20.dts
@@ -39,6 +39,18 @@
 		label = "Factory";
 		reg = <0x100000 0x80000>;
 		read-only;
+
+		compatible = "nvmem-cells";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		macaddr_factory_3fff4: macaddr@3fff4 {
+			reg = <0x3fff4 0x6>;
+		};
+
+		macaddr_factory_3fffa: macaddr@3fffa {
+			reg = <0x3fffa 0x6>;
+		};
 	};
 
 	partition@180000 {
diff --git a/target/linux/ramips/dts/mt7621_jcg_q20.dtsi b/target/linux/ramips/dts/mt7621_jcg_q20.dtsi
index 16febb1143..3165566c6c 100644
--- a/target/linux/ramips/dts/mt7621_jcg_q20.dtsi
+++ b/target/linux/ramips/dts/mt7621_jcg_q20.dtsi
@@ -112,17 +112,3 @@
 		function = "gpio";
 	};
 };
-
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_3fff4: macaddr@3fff4 {
-		reg = <0x3fff4 0x6>;
-	};
-
-	macaddr_factory_3fffa: macaddr@3fffa {
-		reg = <0x3fffa 0x6>;
-	};
-};