ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/dedeckeh.git] / target / linux / ramips / dts / DIR-645.dts

diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts
index d508297ac186ecf0eccc3fc05cd9c945610a3a89..35d011ebba4fbdeacc61f9e81c7bd843d42d6a23 100644 (file)
--- a/target/linux/ramips/dts/DIR-645.dts
+++ b/target/linux/ramips/dts/DIR-645.dts
@@ -2,47 +2,55 @@
 
 #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";
 
+       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 {
+       keys {
                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>;
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                inet {
                        label = "dir-645:green:inet";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                };
 
-               wps {
+               led_wps: wps {
                        label = "dir-645:green:wps";
-                       gpios = <&gpio1 2 0>;
+                       gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -53,7 +61,7 @@
                usb {
                        gpio-export,name = "usb";
                        gpio-export,output = <1>;
-                       gpios = <&gpio1 6 0>;
+                       gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
                };
        };
 };
@@ -66,45 +74,49 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <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>;
+               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>;
+                       };
                };
        };
 };