X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FDIR-600-B1.dts;h=493d49bb73096d87a6e5575bfeed6a433f9219fd;hb=3d680c57286a2f77b9cfba275756c711730c7fe2;hp=72015323759ebf55baa3436072349bb90391ecdc;hpb=553fea9f195aaefa8533b99e0d0c9ff9a27fc4f5;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/DIR-600-B1.dts b/target/linux/ramips/dts/DIR-600-B1.dts
index 7201532375..493d49bb73 100644
--- a/target/linux/ramips/dts/DIR-600-B1.dts
+++ b/target/linux/ramips/dts/DIR-600-B1.dts
@@ -1,20 +1,13 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
 	compatible = "DIR-600-B1", "ralink,rt3050-soc";
 	model = "D-Link DIR-600 B1";
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
 	cfi@1f000000 {
 		compatible = "cfi-flash";
 		reg = <0x1f000000 0x800000>;
@@ -47,18 +40,6 @@
 		};
 	};
 
-	ethernet@10100000 {
-		mtd-mac-address = <&devdata 0x4004>;
-	};
-
-	esw@10110000 {
-		ralink,portmap = <0x2f>;
-	};
-
-	wmac@10180000 {
-		ralink,mtd-eeprom = <&devdata 0x4000>;
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -68,13 +49,13 @@
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
-			linux,code = <0x211>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -82,28 +63,49 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:amber:status";
+			label = "dir-600-b1:amber:status";
 			gpios = <&gpio0 8 1>;
 		};
 
 		status2 {
-			label = "d-link:green:status";
+			label = "dir-600-b1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wan {
-			label = "d-link:amber:wan";
+			label = "dir-600-b1:amber:wan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wan2 {
-			label = "d-link:green:wan";
+			label = "dir-600-b1:green:wan";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-600-b1:blue:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 };
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+			ralink,function = "gpio";
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&devdata 0x4004>;
+};
+
+&esw {
+	mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&devdata 0x4000>;
+};