X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FDIR-300-B1.dts;h=8bc77e422d6f98537cdeb5a91f498480bec399ac;hb=9b7abd9fe29b15d56bb44871b76f8b3396cf313b;hp=621bf088f16b91b2e3208e08a8ce3a1c5ffd2d32;hpb=f44d3f99803be7ba5c38b26a2d8cbda1c301e893;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/DIR-300-B1.dts b/target/linux/ramips/dts/DIR-300-B1.dts
index 621bf088f1..8bc77e422d 100644
--- a/target/linux/ramips/dts/DIR-300-B1.dts
+++ b/target/linux/ramips/dts/DIR-300-B1.dts
@@ -1,103 +1,122 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-	compatible = "DIR-300-B1", "ralink,rt3050-soc";
+	compatible = "dlink,dir-300-b1", "ralink,rt3050-soc";
 	model = "D-Link DIR-300 B1";
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-				ralink,function = "gpio";
-			};
-		};
+	aliases {
+		led-boot = &led_status_green;
+		led-failsafe = &led_status_green;
+		led-running = &led_status_green;
+		led-upgrade = &led_status_green;
 	};
 
 	cfi@1f000000 {
 		compatible = "cfi-flash";
 		reg = <0x1f000000 0x800000>;
-
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition@0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		devdata: partition@30000 {
-			label = "devdata";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition@40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition@50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
-		};
-	};
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4004>;
-	};
+			devdata: partition@30000 {
+				label = "devdata";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
 
-	esw@10110000 {
-		ralink,portmap = <0x2f>;
-	};
+			factory: partition@40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-	wmac@10180000 {
-		ralink,mtd-eeprom = <&devdata 0x4000>;
+			partition@50000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
+		};
 	};
 
-	gpio-keys-polled {
+	keys {
 		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		poll-interval = <20>;
+
 		reset {
 			label = "reset";
-			gpios = <&gpio0 10 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
+
 		wps {
 			label = "wps";
-			gpios = <&gpio0 0 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
-	gpio-leds {
+	leds {
 		compatible = "gpio-leds";
+
 		status {
-			label = "d-link:amber:status";
-			gpios = <&gpio0 8 1>;
+			label = "dir-300-b1:amber:status";
+			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
-		status2 {
-			label = "d-link:green:status";
-			gpios = <&gpio0 9 1>;
+
+		led_status_green: status2 {
+			label = "dir-300-b1:green:status";
+			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
+
 		wan {
-			label = "d-link:amber:wan";
-			gpios = <&gpio0 14 1>;
+			label = "dir-300-b1:amber:wan";
+			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
+
 		wan2 {
-			label = "d-link:green:wan";
-			gpios = <&gpio0 12 1>;
+			label = "dir-300-b1:green:wan";
+			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
+
 		wps {
-			label = "d-link:blue:wps";
-			gpios = <&gpio0 13 1>;
+			label = "dir-300-b1:blue:wps";
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
+
+&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>;
+};