From f519fea4c6dbffc9824b0084b8d720507793754d Mon Sep 17 00:00:00 2001
From: Mathias Kresin <dev@kresin.me>
Date: Mon, 1 Jan 2018 17:58:30 +0100
Subject: lantiq: kernel 4.14: cleanup dts files

Move common used parts to dtsi. Add labels to nodes and reference nodes
via labels in dts files.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---
 .../files-4.14/arch/mips/boot/dts/P2812HNUF3.dts   | 96 +++++++++++-----------
 1 file changed, 47 insertions(+), 49 deletions(-)

(limited to 'target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts')

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts
index d37ad0a8e5..202226aa86 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts
@@ -5,62 +5,60 @@
 / {
 	compatible = "zyxel,p-2812hnu-f3", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9";
 	model = "ZyXEL P-2812HNU-F3";
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x800000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
+&pci0 {
+	wifi@1814,3092 {
+		compatible = "pci1814,3092";
+		reg = <0x7000 0 0 0 0>;
+		ralink,eeprom = "RT3092.eeprom";
+	};
+};
 
-					partition@0 {
-						label = "uboot";
-						reg = <0x0 0x50000>;
-						read-only;
-					};
-					partition@50000 {
-						label = "uboot-env";
-						reg = <0x50000 0x10000>;
-					};
-					partition@60000 {
-						label = "unused";
-						reg = <0x60000 0x7a0000>;
-					};
-				};
-			};
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x800000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-			nand-parts@0 {
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <1 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-				partition@0 {
-					label = "kernel";
-					reg = <0x0 0x200000>;
-				};
-				partition@200000 {
-					label = "ubi";
-					reg = <0x200000 0x7e00000>;
-				};
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x50000>;
+				read-only;
+			};
+			partition@50000 {
+				label = "uboot-env";
+				reg = <0x50000 0x10000>;
+			};
+			partition@60000 {
+				label = "unused";
+				reg = <0x60000 0x7a0000>;
 			};
 		};
 	};
-};
 
-&pci0 {
-	wifi@1814,3092 {
-		compatible = "pci1814,3092";
-		reg = <0x7000 0 0 0 0>;
-		ralink,eeprom = "RT3092.eeprom";
+	nand@1 {
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <1 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "kernel";
+			reg = <0x0 0x200000>;
+		};
+		partition@200000 {
+			label = "ubi";
+			reg = <0x200000 0x7e00000>;
+		};
 	};
 };
-- 
cgit v1.2.3