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, 143 insertions, 147 deletions

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts
index 961fd9b929..d3be43cd99 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts
@@ -25,153 +25,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {				/* NOR Flash: Spansion S29AL004D 512KB */
-				compatible = "lantiq,nor";	/* "AMD AM29LV400BB" compatible on 3.3.8 */
-				lantiq,cs = <0>;
-				bank-width = <2>;
-				reg = <0 0x0 0x80000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>; /* 256KB */
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x10000>; /* 64KB */
-					};
-
-					partition@50000 {
-						label = "rg_conf_1";
-						reg = <0x50000 0x10000>;
-					};
-
-					partition@60000 {
-						label = "rg_conf_2";
-						reg = <0x60000 0x10000>;
-					};
-
-					partition@70000 {
-						label = "rg_conf_factory";
-						reg = <0x70000 0x10000>;
-					};
-				};
-			};
-
-			nand-parts@0 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <1 0x0 0x2000000 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					ath9k_cal: partition@0 {
-						label = "art";	   /* Atheros 9160 wifi b/g/n radio EEPROM */
-						reg = <0x00000 0x4000>;
-						read-only;
-					};
-
-					partition@4000 {
-						label = "kernel";
-						reg = <0x4000 0x200000>;
-					};
-
-					partition@164000 {
-						label = "ubi";
-						reg = <0x204000 0x1DFC000>;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				nand_out {
-					lantiq,groups = "nand cle", "nand ale";
-					lantiq,function = "ebu";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-				nand_cs1 {
-					lantiq,groups = "nand cs1";
-					lantiq,function = "ebu";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-				};
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-				};
-
-				btn_in {
-					lantiq,pins = "io2", "io15", "io22";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-		};
-
-		gpios: stp@E100BB0 {
-			status = "okay";
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -250,6 +103,140 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		nand_out {
+			lantiq,groups = "nand cle", "nand ale";
+			lantiq,function = "ebu";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+		nand_cs1 {
+			lantiq,groups = "nand cs1";
+			lantiq,function = "ebu";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+		};
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+		};
+
+		btn_in {
+			lantiq,pins = "io2", "io15", "io22";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+	};
+};
+
+&gpios {
+	status = "okay";
+};
+
+&gsw {
+	phy-mode = "rmii";
+};
+
+&localbus {
+	nor@0 {				/* NOR Flash: Spansion S29AL004D 512KB */
+		compatible = "lantiq,nor";	/* "AMD AM29LV400BB" compatible on 3.3.8 */
+		lantiq,cs = <0>;
+		bank-width = <2>;
+		reg = <0 0x0 0x80000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>; /* 256KB */
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x10000>; /* 64KB */
+			};
+
+			partition@50000 {
+				label = "rg_conf_1";
+				reg = <0x50000 0x10000>;
+			};
+
+			partition@60000 {
+				label = "rg_conf_2";
+				reg = <0x60000 0x10000>;
+			};
+
+			partition@70000 {
+				label = "rg_conf_factory";
+				reg = <0x70000 0x10000>;
+			};
+		};
+	};
+
+	nand@1 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <1 0x0 0x2000000 >;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ath9k_cal: partition@0 {
+				label = "art";	   /* Atheros 9160 wifi b/g/n radio EEPROM */
+				reg = <0x00000 0x4000>;
+				read-only;
+			};
+
+			partition@4000 {
+				label = "kernel";
+				reg = <0x4000 0x200000>;
+			};
+
+			partition@164000 {
+				label = "ubi";
+				reg = <0x204000 0x1DFC000>;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
@@ -260,3 +247,12 @@
 		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
 	};
 };
+
+&usb {
+	status = "okay";
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};