X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FDIR-645.dts;h=ce4ed42cf188ad75f62e17a6b321eecea3bbe405;hb=d70ec3008d4cd0540a9f6c88fb7e786107f1679a;hp=60e7f46910208c81886c34a0ebeeef1ab2a2d8d3;hpb=d1f8b9bd76ad1959f558a8c439111985fd4b89ee;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts
index 60e7f46910..ce4ed42cf1 100644
--- a/target/linux/ramips/dts/DIR-645.dts
+++ b/target/linux/ramips/dts/DIR-645.dts
@@ -1,108 +1,42 @@
 /dts-v1/;
 
-/include/ "rt3883.dtsi"
+#include "rt3883.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-	compatible = "DIR-645", "ralink,rt3883-soc";
+	compatible = "dlink,dir-645", "ralink,rt3883-soc";
 	model = "D-Link DIR-645";
 
-	palmbus@10000000 {
-		gpio1: gpio@638 {
-			status = "okay";
-		};
-
-		spi@b00 {
-			status = "okay";
-
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "mx25l6405d";
-				reg = <0 0>;
-				linux,modalias = "m25p80";
-				spi-max-frequency = <25000000>;
-				partition@0 {
-					label = "uboot";
-					reg = <0x0 0x30000>;
-					read-only;
-				};
-				partition@30000 {
-					label = "uboot-env";
-					reg = <0x30000 0x4000>;
-					read-only;
-				};
-				factory: partition@34000 {
-					label = "factory";
-					reg = <0x34000 0x4000>;
-					read-only;
-				};
-				partition@38000 {
-					label = "nvram";
-					reg = <0x38000 0x8000>;
-					read-only;
-				};
-				partition@40000 {
-					label = "devdata";
-					reg = <0x40000 0x10000>;
-				};
-				partition@50000 {
-					label = "firmware";
-					reg = <0x50000 0x7b0000>;
-				};
-			};
-		};
-	};
-
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "jtag", "uartf";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
-	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4>;
-		port@0 {
-			ralink,fixed-link = <1000 1 1 0>;
-		};
-	};
-
-	wmac@10180000 {
-		ralink,5ghz = <0>;
-		ralink,mtd-eeprom = <&factory 0>;
-	};
-
-	ehci@101c0000 {
-		status = "okay";
-	};
-
-	ohci@101c1000 {
-		status = "okay";
+	aliases {
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	rtl8367b {
 		compatible = "realtek,rtl8367b";
-		gpio-sda = <&gpio0 1 0>;
-		gpio-sck = <&gpio0 2 0>;
+		gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+		gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>;
 		realtek,extif1 = <1 0 1 1 1 1 1 1 2>;
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		poll-interval = <100>;
+
 		reset {
 			label = "reset";
-			gpios = <&gpio0 9 0>;
-			linux,code = <0x198>;
+			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+			linux,code = <KEY_RESTART>;
 		};
+
 		wps {
 			label = "wps";
-			gpios = <&gpio0 14 0>;
-			linux,code = <0x211>;
+			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -110,22 +44,109 @@
 		compatible = "gpio-leds";
 
 		inet {
-			label = "d-link:green:inet";
-			gpios = <&gpio0 0 1>;
+			label = "dir-645:green:inet";
+			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
 		};
-		wps {
-			label = "d-link:green:wps";
-			gpios = <&gpio1 2 0>;
+
+		led_wps: wps {
+			label = "dir-645:green:wps";
+			gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
+
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
-			gpios = <&gpio1 6 0>;
+			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x4000>;
+				read-only;
+			};
+
+			factory: partition@34000 {
+				label = "factory";
+				reg = <0x34000 0x4000>;
+				read-only;
+			};
+
+			partition@38000 {
+				label = "nvram";
+				reg = <0x38000 0x8000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "devdata";
+				reg = <0x40000 0x10000>;
+			};
+
+			partition@50000 {
+				compatible = "seama";
+				label = "firmware";
+				reg = <0x50000 0x7b0000>;
+			};
 		};
 	};
 };
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "jtag", "uartf";
+			ralink,function = "gpio";
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+
+	port@0 {
+		mediatek,fixed-link = <1000 1 1 0>;
+	};
+};
+
+&wmac {
+	ralink,5ghz = <0>;
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};