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, 112 insertions, 115 deletions

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts
index 4720b57dd3..0d0b70c68a 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts
@@ -19,8 +19,8 @@
 
 		led-dsl = &adsl;
 		led-internet = &internet;
-		led-usb = &usb;
-		led-usb2 = &usb2;
+		led-usb = &led_usb;
+		led-usb2 = &led_usb2;
 		led-wifi = &wifi;
 	};
 
@@ -28,117 +28,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x1000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				lantiq,noxip;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x20000>;
-						read-only;
-					};
-
-					partition@60000 {
-						label = "firmware";
-						reg = <0x60000 0xfa0000>;
-					};
-				};
-			};
-		};
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu a23";
-					lantiq,function = "ebu";
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				exin {
-					lantiq,groups = "exin1", "exin2";
-					lantiq,function = "exin";
-					lantiq,output = <0>;
-				};
-				pci_in {
-					lantiq,groups = "req1", "req2";
-					lantiq,function = "pci";
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1", "gnt2";
-					lantiq,function = "pci";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				buttons {
-					lantiq,pins = "io3", "io14";
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-			};
-		};
-
-		gpios: stp@E100BB0 {
-			status = "okay";
-			lantiq,groups = <0x7>;
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-		};
-
-		pci@E105400 {
-			status = "okay";
-			lantiq,external-clock;
-			interrupt-map = <
-				0x6000 0 0 1 &icu0 135
-				0x7800 0 0 1 &icu0 66
-				0x7800 0 0 2 &icu0 66
-				0x7800 0 0 3 &icu0 66
-			>;
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-			req-mask = <0x7>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -212,11 +101,11 @@
 			label = "phone2";
 			gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "usb";
 			gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
 		};
-		usb2: usb2 {
+		led_usb2: usb2 {
 			label = "usb2";
 			gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
 		};
@@ -230,3 +119,111 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu a23";
+			lantiq,function = "ebu";
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		exin {
+			lantiq,groups = "exin1", "exin2";
+			lantiq,function = "exin";
+			lantiq,output = <0>;
+		};
+		pci_in {
+			lantiq,groups = "req1", "req2";
+			lantiq,function = "pci";
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1", "gnt2";
+			lantiq,function = "pci";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		buttons {
+			lantiq,pins = "io3", "io14";
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+	};
+};
+
+&gpios {
+	status = "okay";
+	lantiq,groups = <0x7>;
+};
+
+&gsw {
+	phy-mode = "rmii";
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x1000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		lantiq,noxip;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			partition@60000 {
+				label = "firmware";
+				reg = <0x60000 0xfa0000>;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	lantiq,external-clock;
+	interrupt-map = <
+		0x6000 0 0 1 &icu0 135
+		0x7800 0 0 1 &icu0 66
+		0x7800 0 0 2 &icu0 66
+		0x7800 0 0 3 &icu0 66
+	>;
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+	req-mask = <0x7>;
+};
+
+&vmmc {
+	status = "okay";
+};