ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / DAP-1350.dts

diff --git a/target/linux/ramips/dts/DAP-1350.dts b/target/linux/ramips/dts/DAP-1350.dts
index 4628544fb6ace70d3d37f7d6c0654d623061a0a3..06d490cacc8030b2daa4ed060591b37ef604d45b 100644 (file)
--- a/target/linux/ramips/dts/DAP-1350.dts
+++ b/target/linux/ramips/dts/DAP-1350.dts
@@ -2,10 +2,20 @@
 
 #include "rt3050.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "DAP-1350", "ralink,rt3052-soc";
+       compatible = "dlink,dap-1350", "ralink,rt3052-soc";
        model = "D-Link DAP-1350";
 
+       aliases {
+               led-boot = &led_power_blue;
+               led-failsafe = &led_power_blue;
+               led-running = &led_power_blue;
+               led-upgrade = &led_power_blue;
+       };
+
        chosen {
                bootargs = "console=ttyS0,115200";
        };
@@ -15,86 +25,89 @@
                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;
-               };
-
-               partition@40000 {
-                       label = "devconf";
-                       reg = <0x40000 0x30000>;
-                       read-only;
-               };
-
-               partition@70000 {
-                       label = "devlang";
-                       reg = <0x70000 0x40000>;
-                       read-only;
-               };
 
-               partition@b0000 {
-                       label = "firmware";
-                       reg = <0xb0000 0x750000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #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;
+                       };
+
+                       partition@40000 {
+                               label = "devconf";
+                               reg = <0x40000 0x30000>;
+                               read-only;
+                       };
+
+                       partition@70000 {
+                               label = "devlang";
+                               reg = <0x70000 0x40000>;
+                               read-only;
+                       };
+
+                       partition@b0000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0xb0000 0x750000>;
+                       };
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power_blue: power {
                        label = "dap-1350:blue:power";
-                       gpios = <&gpio0 8 1>;
+                       gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
 
                power2 {
                        label = "dap-1350:red:power";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "dap-1350:blue:wps";
-                       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>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 0 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
 
                rt {
                        label = "rt";
-                       gpios = <&gpio0 11 1>;
-                       linux,code = <0x100>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_0>;
                };
 
                ap {
                        label = "ap";
-                       gpios = <&gpio0 7 1>;
-                       linux,code = <0x101>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_1>;
                };
        };
 };