X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FDCS-930.dts;h=3c9c3d39f7d7074f19f9693ce129fffc365fa52b;hb=e348ccc4e6e9d16d56bec77b69628205d58e6750;hp=31dab4581469a28eb2477e710f23064236a86b61;hpb=c0f6bf05f4b73d4541865db9785fe691666774cb;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/target/linux/ramips/dts/DCS-930.dts b/target/linux/ramips/dts/DCS-930.dts
index 31dab45814..3c9c3d39f7 100644
--- a/target/linux/ramips/dts/DCS-930.dts
+++ b/target/linux/ramips/dts/DCS-930.dts
@@ -1,118 +1,112 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-	compatible = "DCS-930", "ralink,rt3050-soc";
+	compatible = "dlink,dcs-930", "ralink,rt3050-soc";
 	model = "D-Link DCS-930";
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-				ralink,function = "gpio";
-			};
-		};
+	aliases {
+		led-status = &led_status;
 	};
 
 	cfi@1f000000 {
 		compatible = "cfi-flash";
 		reg = <0x1f000000 0x400000>;
-
 		bank-width = <2>;
 		device-width = <2>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		partition@0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition@30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		factory: partition@40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition@30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition@40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition@50000 {
-			label = "firmware";
-			reg = <0x50000 0x3b0000>;
+			partition@50000 {
+				label = "firmware";
+				reg = <0x50000 0x3b0000>;
+			};
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
+
 		wifi {
-			label = "d-link:red:alert";
-			gpios = <&gpio0 8 1>;
+			label = "dcs-930:red:alert";
+			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
-		power {
-			label = "d-link:green:status";
-			gpios = <&gpio0 9 1>;
+
+		led_status: status {
+			label = "dcs-930:green:status";
+			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
+
 		wps {
-			label = "d-link:blue:wps";
-			gpios = <&gpio0 13 1>;
+			label = "dcs-930:blue:wps";
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "wps";
-			gpios = <&gpio0 0 1>;
-			linux,code = <0x101>;
+			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_1>;
 		};
+
 		reset {
 			label = "reset";
-			gpios = <&gpio0 10 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
+};
 
-	esw@10110000 {
-		ralink,portmap = <0x2f>;
-
-		port@0 {
-			compatible = "swconfig,port";
-			swconfig,segment = "lan";
-			swconfig,portmap = <0 4>;
-		};
-		port@1 {
-			compatible = "swconfig,port";
-			swconfig,segment = "lan";
-			swconfig,portmap = <1 3>;
-		};
-		port@2 {
-			compatible = "swconfig,port";
-			swconfig,segment = "lan";
-			swconfig,portmap = <2 2>;
-		};
-		port@3 {
-			compatible = "swconfig,port";
-			swconfig,segment = "lan";
-			swconfig,portmap = <3 1>;
-		};
-		port@4 {
-			compatible = "swconfig,port";
-			swconfig,segment = "wan";
-			swconfig,portmap = <4 0>;
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+			ralink,function = "gpio";
 		};
 	};
+};
 
-	otg@101c0000 {
-		status = "okay";
-	};
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+	mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+	status = "okay";
 };