From 9195d8da355d0d141ac02c9a5269452dc64ffd2d Mon Sep 17 00:00:00 2001
From: Stanislav Galabov <stanislav_galabov@smartcom.bg>
Date: Tue, 10 May 2016 13:41:46 +0300
Subject: 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>
---
 target/linux/ramips/dts/WIZFI630A.dts | 222 +++++++++++++++++-----------------
 1 file changed, 112 insertions(+), 110 deletions(-)

(limited to 'target/linux/ramips/dts/WIZFI630A.dts')

diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts
index 11b44b4f72..68af608b5e 100644
--- a/target/linux/ramips/dts/WIZFI630A.dts
+++ b/target/linux/ramips/dts/WIZFI630A.dts
@@ -10,116 +10,6 @@
 		bootargs = "console=ttyS1,115200";
 	};
 
-	palmbus@10000000 {
-		gpio1: gpio@660 {
-			status = "okay";
-		};
-
-		spi@b00 {
-			status = "okay";
-
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "jedec,spi-nor";
-				reg = <0>;
-				linux,modalias = "m25p80", "w25q128";
-				spi-max-frequency = <10000000>;
-
-				partition@0 {
-					label = "uboot";
-					reg = <0x0 0x30000>;
-					read-only;
-				};
-
-				partition@30000 {
-					label = "uboot-env";
-					reg = <0x30000 0x10000>;
-					read-only;
-				};
-
-				factory: partition@40000 {
-					label = "factory";
-					reg = <0x40000 0x10000>;
-					read-only;
-				};
-
-				partition@50000 {
-					label = "firmware";
-					reg = <0x50000 0xfb0000>;
-				};
-			};
-		};
-
-		uart@500 {
-			compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
-			reg = <0x500 0x100>;
-			resets = <&rstctrl 12>;
-			reset-names = "uart";
-			interrupt-parent = <&intc>;
-			interrupts = <5>;
-			reg-shift = <2>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&uartf_pins>;
-			status = "okay";
-		};
-
-		uartlite@c00 {
-			compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
-			reg = <0xc00 0x100>;
-			resets = <&rstctrl 19>;
-			reset-names = "uartl";
-			interrupt-parent = <&intc>;
-			interrupts = <12>;
-			reg-shift = <2>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&uartlite_pins>;
-		};
-	};
-
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "jtag" ;
-				ralink,function = "gpio";
-			};
-		};
-
-		uartf_gpio_pins: uartf_gpio {
-			uartf_gpio {
-				ralink,group = "uartf";
-				ralink,function = "uartf";
-			};
-		};
-
-		uartlite_pins: uartlite {
-			uart {
-				ralink,group = "uartlite";
-				ralink,function = "uartlite";
-			};
-		};
-	};
-
-	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4>;
-	};
-
-	esw@10110000 {
-		mediatek,portmap = <0x17>;
-	};
-
-	wmac@10180000 {
-		ralink,mtd-eeprom = <&factory 0>;
-	};
-
-	ehci@101c0000 {
-		status = "okay";
-	};
-
-	ohci@101c1000 {
-		status = "okay";
-	};
-
 	gpio-export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
@@ -180,3 +70,115 @@
 		};
 	};
 };
+
+&gpio1 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0 0>;
+		linux,modalias = "m25p80", "w25q128";
+		spi-max-frequency = <10000000>;
+
+		partition@0 {
+			#size-cells = <1>;
+			label = "uboot";
+			reg = <0x0 0x30000>;
+			read-only;
+		};
+
+		partition@30000 {
+			#size-cells = <1>;
+			label = "uboot-env";
+			reg = <0x30000 0x10000>;
+			read-only;
+		};
+
+		factory: partition@40000 {
+			#size-cells = <1>;
+			label = "factory";
+			reg = <0x40000 0x10000>;
+			read-only;
+		};
+
+		partition@50000 {
+			#size-cells = <1>;
+			label = "firmware";
+			reg = <0x50000 0xfb0000>;
+		};
+	};
+};
+
+&uart {
+	compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
+	reg = <0x500 0x100>;
+	resets = <&rstctrl 12>;
+	reset-names = "uart";
+	interrupt-parent = <&intc>;
+	interrupts = <5>;
+	reg-shift = <2>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&uartf_pins>;
+	status = "okay";
+};
+
+&uartlite {
+	compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
+	reg = <0xc00 0x100>;
+	resets = <&rstctrl 19>;
+	reset-names = "uartl";
+	interrupt-parent = <&intc>;
+	interrupts = <12>;
+	reg-shift = <2>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&uartlite_pins>;
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "jtag" ;
+			ralink,function = "gpio";
+		};
+	};
+
+	uartf_gpio_pins: uartf_gpio {
+		uartf_gpio {
+			ralink,group = "uartf";
+			ralink,function = "uartf";
+		};
+	};
+
+	uartlite_pins: uartlite {
+		uart {
+			ralink,group = "uartlite";
+			ralink,function = "uartlite";
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+	mediatek,portmap = <0x17>;
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};
-- 
cgit v1.2.3