From 2d3542e1c9d3267285fbf8048ab35ad6c3f95155 Mon Sep 17 00:00:00 2001
From: Stanislav Galabov <sgalabov@gmail.com>
Date: Fri, 24 Jun 2016 11:43:17 +0200
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/BR-6475ND.dts | 188 +++++++++++++++++-----------------
 1 file changed, 93 insertions(+), 95 deletions(-)

(limited to 'target/linux/ramips/dts/BR-6475ND.dts')

diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index 6211e4319e..f437ac165c 100644
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -6,77 +6,45 @@
 	compatible = "BR-6475ND", "ralink,rt3883-soc";
 	model = "Edimax BR-6475nD";
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "spi", "jtag", "uartf";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
-	palmbus@10000000 {
-		timer@100 {
-			status = "okay";
-		};
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <100>;
 
-		gpio1: gpio@638 {
-			status = "okay";
+		reset {
+			label = "reset";
+			gpios = <&gpio0 7 1>;
+			linux,code = <0x198>;
 		};
 
-		uartlite@c00 {
-			status = "okay";
+		rfkill {
+			label = "rfkill";
+			gpios = <&gpio0 9 1>;
+			linux,input-type = <5>;
+			linux,code = <0xf7>;
 		};
 	};
 
-	ethernet@10100000 {
-		status = "okay";
-		mtd-mac-address = <&devdata 0x0d>;
+	gpio-leds {
+		compatible = "gpio-leds";
 
-		port@0 {
-			mediatek,fixed-link = <1000 1 1 1>;
+		power {
+			label = "br-6475nd:green:power";
+			gpios = <&gpio0 10 1>;
 		};
-	};
 
-	wmac@10180000 {
-		status = "okay";
-		ralink,mtd-eeprom = <&factory 0>;
-	};
-
-	pci@10140000 {
-		status = "okay";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pci_pins>;
-
-		pci_pins: pci {
-			pci {
-				ralink,group = "pci";
-				ralink,function = "pci-fnc";
-			};
+		wlan {
+			label = "br-6475nd:amber:wlan";
+			gpios = <&gpio0 11 1>;
 		};
 
-		host-bridge {
-			pci-bridge@1 {
-				status = "okay";
-
-				wmac@0,0 {
-					ralink,5ghz = <0>;
-					compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
-					reg = < 0x10000 0 0 0 0 >;
-					ralink,eeprom = "rt2x00pci_1_0.eeprom";
-				};
-			};
+		wlan_5ghz {
+			label = "br-6475nd:amber:wlan_5ghz";
+			gpios = <&gpio0 14 1>;
 		};
 	};
 
-	ehci@101c0000 {
-		status = "okay";
-	};
-
-	ohci@101c1000 {
-		status = "okay";
-	};
-
 	nor-flash@1c000000 {
 		compatible = "cfi-flash";
 		reg = <0x1c000000 0x800000>;
@@ -126,58 +94,88 @@
 		realtek,extif0 = <1 0 1 1 1 1 1 1 2>;
 	};
 
-	gpio-keys-polled {
-		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
+	/* Unclear if this is the correct gpio setup; the USB ports are
+	   unpopulated on a stock BR-6475nD, even though the hardware exists
+	   and the headers are there. */
+	/*
+	gpio_export {
+		compatible = "gpio-export";
 		#size-cells = <0>;
-		poll-interval = <100>;
 
-		reset {
-			label = "reset";
-			gpios = <&gpio0 7 1>;
-			linux,code = <0x198>;
+		usb {
+			gpio-export,name="usb";
+			gpio-export,output=<0>;
+			gpios = <&gpio0 19 0>;
 		};
+	};
+	*/
+};
 
-		rfkill {
-			label = "rfkill";
-			gpios = <&gpio0 9 1>;
-			linux,input-type = <5>;
-			linux,code = <0xf7>;
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "spi", "jtag", "uartf";
+			ralink,function = "gpio";
 		};
 	};
+};
 
-	gpio-leds {
-		compatible = "gpio-leds";
+&timer {
+	status = "okay";
+};
 
-		power {
-			label = "br-6475nd:green:power";
-			gpios = <&gpio0 10 1>;
-		};
+&gpio1 {
+	status = "okay";
+};
 
-		wlan {
-			label = "br-6475nd:amber:wlan";
-			gpios = <&gpio0 11 1>;
-		};
+&uartlite {
+	status = "okay";
+};
 
-		wlan_5ghz {
-			label = "br-6475nd:amber:wlan_5ghz";
-			gpios = <&gpio0 14 1>;
+&ethernet {
+	status = "okay";
+	mtd-mac-address = <&devdata 0x0d>;
+
+	port@0 {
+		mediatek,fixed-link = <1000 1 1 1>;
+	};
+};
+
+&wmac {
+	status = "okay";
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&pci {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pci_pins>;
+
+	pci_pins: pci {
+		pci {
+			ralink,group = "pci";
+			ralink,function = "pci-fnc";
 		};
 	};
 
-	/* Unclear if this is the correct gpio setup; the USB ports are
-	   unpopulated on a stock BR-6475nD, even though the hardware exists
-	   and the headers are there. */
-	/*
-	gpio_export {
-		compatible = "gpio-export";
-		#size-cells = <0>;
+	host-bridge {
+		pci-bridge@1 {
+			status = "okay";
 
-		usb {
-			gpio-export,name="usb";
-			gpio-export,output=<0>;
-			gpios = <&gpio0 19 0>;
+			wmac@0,0 {
+				ralink,5ghz = <0>;
+				compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
+				reg = < 0x10000 0 0 0 0 >;
+				ralink,eeprom = "rt2x00pci_1_0.eeprom";
+			};
 		};
 	};
-	*/
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
 };
-- 
cgit v1.2.3