X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FNA930.dts;h=522bc7585510f9ce0e73c26117f0b35914083971;hb=2b55c83e68068887db9e49de8e81b1b4a267a4f2;hp=4397b2cc3f2ddffeef8e13bd816a592de214a8b0;hpb=553fea9f195aaefa8533b99e0d0c9ff9a27fc4f5;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/NA930.dts b/target/linux/ramips/dts/NA930.dts
index 4397b2cc3f..522bc75855 100644
--- a/target/linux/ramips/dts/NA930.dts
+++ b/target/linux/ramips/dts/NA930.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "mt7620a.dtsi"
+#include "mt7620a.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
 	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
@@ -10,34 +12,6 @@
 		bootargs = "console=ttyS1,57600";
 	};
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "rgmii2", "spi", "ephy";
-				ralink,function = "gpio";
-			};
-
-			uartf_gpio {
-				ralink,group = "uartf";
-				ralink,function = "gpio uartf";
-			};
-		};
-	};
-
-	palmbus@10000000 {
-		uart@500 {
-			status = "okay";
-		};
-
-		gpio@638 {
-			status = "okay";
-		};
-
-		gpio@660 {
-			status = "okay";
-		};
-	};
-
 	nand {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -67,39 +41,6 @@
 		};
 	};
 
-	ethernet@10100000 {
-		status = "okay";
-		pinctrl-names = "default";
-		pinctrl-0 = <&rgmii1_pins &mdio_pins>;
-		ralink,port-map = "llllw";
-
-		port@4 {
-			status = "okay";
-			phy-handle = <&phy4>;
-			phy-mode = "rgmii";
-		};
-
-		port@5 {
-			status = "okay";
-			phy-handle = <&phy5>;
-			phy-mode = "rgmii";
-		};
-
-		mdio-bus {
-			status = "okay";
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-				phy-mode = "rgmii";
-			};
-
-			phy5: ethernet-phy@5 {
-				reg = <5>;
-				phy-mode = "rgmii";
-			};
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -109,19 +50,19 @@
 		reset {
 			label = "reset";
 			gpios = <&gpio0 11 1>;
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 		};
 
 		zwave {
 			label = "zwave";
 			gpios = <&gpio0 12 1>;
-			linux,code = <0x100>;
+			linux,code = <BTN_0>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 14 1>;
-			linux,code = <0x211>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -159,16 +100,75 @@
 			gpios = <&gpio0 13 0>;
 		};
 	};
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "rgmii2", "spi", "ephy";
+			ralink,function = "gpio";
+		};
+
+		uartf_gpio {
+			ralink,group = "uartf";
+			ralink,function = "gpio uartf";
+		};
+	};
+};
+
+&uart {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&ethernet {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&rgmii1_pins &mdio_pins>;
+	mediatek,portmap = "llllw";
 
-	gsw@10110000 {
-		ralink,port4 = "gmac";
+	port@4 {
+		status = "okay";
+		phy-handle = <&phy4>;
+		phy-mode = "rgmii";
 	};
 
-	ehci@101c0000 {
+	port@5 {
 		status = "okay";
+		phy-handle = <&phy5>;
+		phy-mode = "rgmii";
 	};
 
-	ohci@101c1000 {
+	mdio-bus {
 		status = "okay";
+
+		phy4: ethernet-phy@4 {
+			reg = <4>;
+			phy-mode = "rgmii";
+		};
+
+		phy5: ethernet-phy@5 {
+			reg = <5>;
+			phy-mode = "rgmii";
+		};
 	};
 };
+
+&gsw {
+	mediatek,port4 = "gmac";
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};