ramips: DTS rework

Add node aliases to dtsi files.
Reword dts files so they're more in-line with upstream.
Fix some more warnings and errors reported by dtc

Signed-off-by: Stanislav Galabov <sgalabov@gmail.com>

1 files changed, 121 insertions, 124 deletions

diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts
index 43ff78bc..47aba36 100644
--- a/target/linux/ramips/dts/LINKIT7688.dts
+++ b/target/linux/ramips/dts/LINKIT7688.dts
@@ -19,128 +19,6 @@
 		reg = <0x0 0x8000000>;
 	};
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "gpio";
-				ralink,function = "gpio";
-			};
-
-			perst {
-				ralink,group = "perst";
-				ralink,function = "gpio";
-			};
-
-			refclk {
-				ralink,group = "refclk";
-				ralink,function = "gpio";
-			};
-
-			i2s {
-				ralink,group = "i2s";
-				ralink,function = "gpio";
-			};
-
-			spis {
-				ralink,group = "spis";
-				ralink,function = "gpio";
-			};
-
-			wled_kn {
-				ralink,group = "wled_kn";
-				ralink,function = "gpio";
-			};
-
-			wled_an {
-				ralink,group = "wled_an";
-				ralink,function = "wled_an";
-			};
-
-			wdt {
-				ralink,group = "wdt";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
-	wmac@10300000 {
-		status = "okay";
-	};
-
-	palmbus@10000000 {
-		spi@b00 {
-			status = "okay";
-
-			pinctrl-names = "default";
-			pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
-
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "jedec,spi-nor";
-				reg = <0 0>;
-				linux,modalias = "m25p80", "mx25l25635e";
-				spi-max-frequency = <40000000>;
-				m25p,chunked-io = <31>;
-
-				partition@0 {
-					label = "u-boot";
-					reg = <0x0 0x30000>;
-					read-only;
-				};
-
-				partition@30000 {
-					label = "u-boot-env";
-					reg = <0x30000 0x10000>;
-				};
-
-				factory: partition@40000 {
-					label = "factory";
-					reg = <0x40000 0x10000>;
-					read-only;
-				};
-
-				partition@50000 {
-					label = "firmware";
-					reg = <0x50000 0x1fb0000>;
-				};
-			};
-
-			spidev@1 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "spidev";
-				reg = <1 0>;
-				spi-max-frequency = <40000000>;
-			};
-		};
-
-		i2c@900 {
-			status = "okay";
-		};
-
-		uart1@d00 {
-			status = "okay";
-		};
-
-		uart2@e00 {
-			status = "okay";
-		};
-
-		pwm@5000 {
-			status = "okay";
-		};
-	};
-
-	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x28>;
-	};
-
-	sdhci@10130000 {
-		status = "okay";
-		mediatek,cd-high;
-	};
-
 	bootstrap {
 		compatible = "mediatek,linkit";
 
@@ -149,7 +27,7 @@
 
 	gpio-leds {
 		compatible = "gpio-leds";
-	
+
 		wifi {
 			label = "mediatek:orange:wifi";
 			gpios = <&wgpio 0 0>;
@@ -162,7 +40,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-	
+
 		wps {
 			label = "reset";
 			gpios = <&gpio1 6 1>;
@@ -177,5 +55,124 @@
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "gpio";
+			ralink,function = "gpio";
+		};
+
+		perst {
+			ralink,group = "perst";
+			ralink,function = "gpio";
+		};
+
+		refclk {
+			ralink,group = "refclk";
+			ralink,function = "gpio";
+		};
+
+		i2s {
+			ralink,group = "i2s";
+			ralink,function = "gpio";
+		};
+
+		spis {
+			ralink,group = "spis";
+			ralink,function = "gpio";
+		};
+
+		wled_kn {
+			ralink,group = "wled_kn";
+			ralink,function = "gpio";
+		};
+
+		wled_an {
+			ralink,group = "wled_an";
+			ralink,function = "wled_an";
+		};
+
+		wdt {
+			ralink,group = "wdt";
+			ralink,function = "gpio";
+		};
+	};
+};
+
+&wmac {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0 0>;
+		linux,modalias = "m25p80", "mx25l25635e";
+		spi-max-frequency = <40000000>;
+		m25p,chunked-io = <31>;
+
+		partition@0 {
+			label = "u-boot";
+			reg = <0x0 0x30000>;
+			read-only;
+		};
+
+		partition@30000 {
+			label = "u-boot-env";
+			reg = <0x30000 0x10000>;
+		};
+
+		factory: partition@40000 {
+			label = "factory";
+			reg = <0x40000 0x10000>;
+			read-only;
+		};
+
+		partition@50000 {
+			label = "firmware";
+			reg = <0x50000 0x1fb0000>;
+		};
+	};
+
+	spidev@1 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "spidev";
+		reg = <1 0>;
+		spi-max-frequency = <40000000>;
+	};
+};
+
+&i2c {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
+
+&pwm {
+	status = "okay";
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x28>;
+};
 
+&sdhci {
+	status = "okay";
+	mediatek,cd-high;
 };