ramips: dts: Unify naming of gpio-keys nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / WHR-G300N.dts

diff --git a/target/linux/ramips/dts/WHR-G300N.dts b/target/linux/ramips/dts/WHR-G300N.dts
index 4f80f2db1a364f0ba60db20850e0de0351a87457..0966b60aad0d6a35dff211dccd9928d41b85db3b 100644 (file)
--- a/target/linux/ramips/dts/WHR-G300N.dts
+++ b/target/linux/ramips/dts/WHR-G300N.dts
@@ -2,17 +2,61 @@
 
 #include "rt3050.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "WHR-G300N", "ralink,rt3052-soc";
+       compatible = "buffalo,whr-g300n", "ralink,rt3052-soc";
        model = "Buffalo WHR-G300N";
 
+       aliases {
+               led-boot = &led_router;
+               led-failsafe = &led_router;
+               led-running = &led_router;
+               led-upgrade = &led_router;
+       };
+
        cfi@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
                device-width = <2>;
-               #address-cells = <1>;
-               #size-cells = <1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               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 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0x3a0000>;
+                       };
+
+                       partition@3f0000 {
+                               label = "user";
+                               reg = <0x3f0000 0x10000>;
+                               read-only;
+                       };
+               };
        };
 
        gpio-leds {
@@ -20,48 +64,46 @@
 
                diag {
                        label = "whr-g300n:red:diag";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
-               router {
+               led_router: router {
                        label = "whr-g300n:green:router";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                security {
                        label = "whr-g300n:amber:security";
-                       gpios = <&gpio0 14 1>;
+                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
        };
 
-       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>;
                };
 
                aoss {
                        label = "aoss";
-                       gpios = <&gpio0 0 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
 
                router-off {
                        label = "router-off";
-                       gpios = <&gpio0 11 1>;
-                       linux,code = <0x102>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_2>;
                };
 
                router-on {
                        label = "router-on";
-                       gpios = <&gpio0 8 1>;
-                       linux,code = <0x103>;
+                       gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_3>;
                };
        };
 };
@@ -75,12 +117,14 @@
        };
 };
 
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
 &esw {
        mediatek,portmap = <0x2f>;
 };
 
-/* FIXME: no partitions defined */
-/*&wmac {
+&wmac {
        ralink,mtd-eeprom = <&factory 0>;
 };
-*/