X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FWHR-G300N.dts;h=c0779e25bddad746c5f17098cc356e8cb3332145;hb=2b55c83e68068887db9e49de8e81b1b4a267a4f2;hp=30541313ad8b7d7b0ce9a99ddfaf7719c528a736;hpb=f44d3f99803be7ba5c38b26a2d8cbda1c301e893;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/WHR-G300N.dts b/target/linux/ramips/dts/WHR-G300N.dts
index 30541313ad..c0779e25bd 100644
--- a/target/linux/ramips/dts/WHR-G300N.dts
+++ b/target/linux/ramips/dts/WHR-G300N.dts
@@ -1,49 +1,35 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
 	compatible = "WHR-G300N", "ralink,rt3052-soc";
 	model = "Buffalo WHR-G300N";
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
 	cfi@1f000000 {
 		compatible = "cfi-flash";
 		reg = <0x1f000000 0x800000>;
-
 		bank-width = <2>;
 		device-width = <2>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 	};
 
-	esw@10110000 {
-		ralink,portmap = <0x2f>;
-	};
-
-	/* FIXME: no partitions defined */
-/*	wmac@10180000 {
-		ralink,mtd-eeprom = <&factory 0>;
-	};
-*/
 	gpio-leds {
 		compatible = "gpio-leds";
+
 		diag {
 			label = "whr-g300n:red:diag";
 			gpios = <&gpio0 7 1>;
 		};
+
 		router {
 			label = "whr-g300n:green:router";
 			gpios = <&gpio0 9 1>;
 		};
+
 		security {
 			label = "whr-g300n:amber:security";
 			gpios = <&gpio0 14 1>;
@@ -55,25 +41,48 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
+
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 		};
+
 		aoss {
 			label = "aoss";
 			gpios = <&gpio0 0 1>;
-			linux,code = <0x211>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
+
 		router-off {
 			label = "router-off";
 			gpios = <&gpio0 11 1>;
-			linux,code = <0x102>;
+			linux,code = <BTN_2>;
 		};
+
 		router-on {
 			label = "router-on";
 			gpios = <&gpio0 8 1>;
-			linux,code = <0x103>;
+			linux,code = <BTN_3>;
+		};
+	};
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+			ralink,function = "gpio";
 		};
 	};
 };
+
+&esw {
+	mediatek,portmap = <0x2f>;
+};
+
+/* FIXME: no partitions defined */
+/*&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};
+*/