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, 105 insertions, 114 deletions

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
index 3591b43671..bb73a26d56 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
@@ -26,120 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpiomm 1 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 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x7d0000>;
-					};
-
-					boardconfig: partition@7f0000 {
-						label = "board_config";
-						reg = <0x7f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <0x3>;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_in {
-					lantiq,groups = "req2", "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>;
-				};
-				leds {
-					lantiq,pins = "io3", "io5", "io6", "io8";
-					lantiq,output = <1>;
-					lantiq,pull = <0>;
-				};
-				keys {
-					lantiq,pins = "io11", "io12", "io13", "io28";
-					lantiq,output = <0>;
-					lantiq,pull = <2>;
-					lantiq,open-drain = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -222,6 +108,101 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_in {
+			lantiq,groups = "req2", "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>;
+		};
+		leds {
+			lantiq,pins = "io3", "io5", "io6", "io8";
+			lantiq,output = <1>;
+			lantiq,pull = <0>;
+		};
+		keys {
+			lantiq,pins = "io11", "io12", "io13", "io28";
+			lantiq,output = <0>;
+			lantiq,pull = <2>;
+			lantiq,open-drain = <1>;
+		};
+	};
+};
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <0x3>;
+};
+
+&gsw {
+	phy-mode = "rmii";
+	mtd-mac-address = <&boardconfig 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 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x7d0000>;
+			};
+
+			boardconfig: partition@7f0000 {
+				label = "board_config";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	lantiq,external-clock;
@@ -236,3 +217,13 @@
 		ralink,mtd-eeprom-swap;
 	};
 };
+
+&usb {
+	status = "okay";
+	gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
+};