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>
---
 .../arch/mips/boot/dts/EASY80920NAND.dts           | 83 +++++++++++-----------
 1 file changed, 40 insertions(+), 43 deletions(-)

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

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts
index 095bd564da..0134a7c177 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts
@@ -10,58 +10,55 @@
 	chosen {
 		bootargs = "ubi.mtd=ubi ubi.block=0,rootfsA root=/dev/ubiblock0_1";
 	};
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			ranges = <0 0 0x4000000 0x3ffffff>;
-			nand-parts@0 {
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+&localbus {
+	nand@0 {
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x100000>; /* 1024 KB */
-					};
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x100000>; /* 1024 KB */
+			};
 
-					partition@100000 {
-						label = "uboot_env";
-						reg = <0x100000 0x40000>; /* 256 KB */
-					};
+			partition@100000 {
+				label = "uboot_env";
+				reg = <0x100000 0x40000>; /* 256 KB */
+			};
 
-					partition@140000 {
-						label = "ubootconfigB";
-						reg = <0x140000 0x40000>; /* 256 KB */
-					};
+			partition@140000 {
+				label = "ubootconfigB";
+				reg = <0x140000 0x40000>; /* 256 KB */
+			};
 
-					partition@180000 {
-						label = "gphyfirmware";
-						reg = <0x180000 0x40000>; /* 256 KB */
-					};
+			partition@180000 {
+				label = "gphyfirmware";
+				reg = <0x180000 0x40000>; /* 256 KB */
+			};
 
-					partition@1c0000 {
-						label = "ubi";
-						reg = <0x1c0000 0xc800000>;
-					};
+			partition@1c0000 {
+				label = "ubi";
+				reg = <0x1c0000 0xc800000>;
+			};
 
-					partition@c9c0000 {
-						label = "calibration";
-						reg = <0xc9c0000 0x100000>;
-					};
+			partition@c9c0000 {
+				label = "calibration";
+				reg = <0xc9c0000 0x100000>;
+			};
 
-					partition@cac0000 {
-						label = "res";
-						reg = <0xcac0000 0x13540000>;
-					};
-				};
+			partition@cac0000 {
+				label = "res";
+				reg = <0xcac0000 0x13540000>;
 			};
 		};
 	};
-- 
cgit v1.2.3