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>

1 files changed, 84 insertions, 88 deletions

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
index 4edcde9763..adc1dd8354 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
@@ -26,94 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	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>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x30000>;	/* 192 KiB */
-						read-only;
-					};
-
-					partition@30000 {
-						label = "uboot";
-						reg = <0x30000 0x10000>;	/* 64 KiB */
-						read-only;
-					};
-
-					partition@40000 {
-						label = "firmware";
-						reg = <0x40000 0x7B0000>;       /* 7872 KiB */
-					};
-
-					art: partition@7F0000 {
-						label = "art";
-						reg = <0x7F0000 0x10000>;       /* 64 KiB*/
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-				relay {
-					lantiq,pins = "io31";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&art 0x16>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -166,6 +78,79 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+		relay {
+			lantiq,pins = "io31";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&art 0x16>;
+};
+
+&localbus {
+	nor@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>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x30000>;	/* 192 KiB */
+				read-only;
+			};
+
+			partition@30000 {
+				label = "uboot";
+				reg = <0x30000 0x10000>;	/* 64 KiB */
+				read-only;
+			};
+
+			partition@40000 {
+				label = "firmware";
+				reg = <0x40000 0x7B0000>;       /* 7872 KiB */
+			};
+
+			art: partition@7F0000 {
+				label = "art";
+				reg = <0x7F0000 0x10000>;       /* 64 KiB*/
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
@@ -178,3 +163,14 @@
 		mtd-mac-address-increment = <1>;
 	};
 };
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};