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/ArcherC20i.dts | 166 ++++++++++++++++-----------------
 1 file changed, 82 insertions(+), 84 deletions(-)

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

diff --git a/target/linux/ramips/dts/ArcherC20i.dts b/target/linux/ramips/dts/ArcherC20i.dts
index 7d830b3182..aab1f9b90c 100644
--- a/target/linux/ramips/dts/ArcherC20i.dts
+++ b/target/linux/ramips/dts/ArcherC20i.dts
@@ -10,109 +10,107 @@
 		bootargs = "console=ttyS0,115200";
 	};
 
-	palmbus@10000000 {
-		gpio2: gpio@660 {
-			status = "okay";
+	gpio-leds {
+		compatible = "gpio-leds";
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <20>;
+	};
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0 0>;
+		linux,modalias = "m25p80", "mx25l6405d";
+		spi-max-frequency = <10000000>;
+
+		partition@0 {
+			label = "u-boot";
+			reg = <0x0 0x20000>;
+			read-only;
+		};
+
+		partition@20000 {
+			label = "firmware";
+			reg = <0x20000 0x7a0000>;
 		};
 
-		spi@b00 {
-			status = "okay";
-
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "jedec,spi-nor";
-				reg = <0 0>;
-				linux,modalias = "m25p80", "mx25l6405d";
-				spi-max-frequency = <10000000>;
-
-				partition@0 {
-					label = "u-boot";
-					reg = <0x0 0x20000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x7a0000>;
-				};
-
-				partition@7c0000 {
-					label = "config";
-					reg = <0x7c0000 0x10000>;
-				};
-
-				rom: partition@7d0000 {
-					label = "rom";
-					reg = <0x7d0000 0x10000>;
-				};
-
-				partition@7e0000 {
-					label = "romfile";
-					reg = <0x7e0000 0x10000>;
-				};
-
-				radio: partition@7f0000 {
-					label = "radio";
-					reg = <0x7f0000 0x10000>;
-				};
-			};
+		partition@7c0000 {
+			label = "config";
+			reg = <0x7c0000 0x10000>;
+		};
+
+		rom: partition@7d0000 {
+			label = "rom";
+			reg = <0x7d0000 0x10000>;
+		};
+
+		partition@7e0000 {
+			label = "romfile";
+			reg = <0x7e0000 0x10000>;
+		};
+
+		radio: partition@7f0000 {
+			label = "radio";
+			reg = <0x7f0000 0x10000>;
 		};
 	};
+};
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-				ralink,function = "gpio";
-			};
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+			ralink,function = "gpio";
 		};
 	};
+};
 
-	ethernet@10100000 {
+&ethernet {
 		pinctrl-names = "default";
 		pinctrl-0 = <&ephy_pins>;
 		mtd-mac-address = <&rom 0xf100>;
 		mediatek,portmap = "wllll";
 	};
 
-	ehci@101c0000 {
-		status = "okay";
-	};
+&ehci {
+	status = "okay";
+};
 
-	ohci@101c1000 {
-		status = "okay";
-	};
+&ohci {
+	status = "okay";
+};
 
-	gsw@10110000 {
-		mediatek,port4 = "ephy";
-	};
+&gsw {
+	mediatek,port4 = "ephy";
+};
 
-	wmac@10180000 {
-		ralink,mtd-eeprom = <&radio 0>;
-	};
+&wmac {
+	ralink,mtd-eeprom = <&radio 0>;
+};
 
-	pcie@10140000 {
-		status = "okay";
+&pcie {
+	status = "okay";
 
-		pcie-bridge {
-			mt76@0,0 {
-				reg = <0x0000 0 0 0 0>;
-				device_type = "pci";
-				mediatek,mtd-eeprom = <&radio 32768>;
-				mediatek,2ghz = <0>;
-			};
+	pcie-bridge {
+		mt76@0,0 {
+			reg = <0x0000 0 0 0 0>;
+			device_type = "pci";
+			mediatek,mtd-eeprom = <&radio 32768>;
+			mediatek,2ghz = <0>;
 		};
 	};
-
-	gpio-leds {
-		compatible = "gpio-leds";
-	};
-
-	gpio-keys-polled {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		poll-interval = <20>;
-	};
 };
-- 
cgit v1.2.3