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/ALL0333CJ.dts    | 124 ++++++++++-----------
 1 file changed, 60 insertions(+), 64 deletions(-)

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

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts
index 16c5facb35..0d128e0385 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts
@@ -24,70 +24,6 @@
 		reg = <0x0 0x1000000>;
 	};
 
-	fpi@b0000000 {
-		etop@E180000 {
-			phy-mode = "mii";
-		};
-	};
-
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				asc {
-					lantiq,groups = "asc";
-					lantiq,function = "asc";
-				};
-				keys_in {
-					lantiq,pins = "io0",/* "io25", */"io29";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <1>;
-				};
-			};
-		};
-
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x400000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "firmware";
-						reg = <0x10000 0x3ef200>;
-					};
-
-					partition@3ff200 {
-						label = "uboot_env";
-						reg = <0x3ff200 0xc00>;
-						read-only;
-					};
-
-					partition@3ffe00 {
-						label = "dummy_bits";
-						reg = <0x3ffe00 0x200>;
-						read-only;
-					};
-				};
-			};
-		};
-	};
-
 	gpio-leds {
 		compatible = "gpio-leds";
 
@@ -118,3 +54,63 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		asc {
+			lantiq,groups = "asc";
+			lantiq,function = "asc";
+		};
+		keys_in {
+			lantiq,pins = "io0",/* "io25", */"io29";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <1>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x400000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "firmware";
+				reg = <0x10000 0x3ef200>;
+			};
+
+			partition@3ff200 {
+				label = "uboot_env";
+				reg = <0x3ff200 0xc00>;
+				read-only;
+			};
+
+			partition@3ffe00 {
+				label = "dummy_bits";
+				reg = <0x3ffe00 0x200>;
+				read-only;
+			};
+		};
+	};
+};
-- 
cgit v1.2.3