ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / HPM.dts

diff --git a/target/linux/ramips/dts/HPM.dts b/target/linux/ramips/dts/HPM.dts
index 000750fa1270c2c59de4e6e68016aa3128780683..7ccd0781444681d2859b8a4aa623919fb9f8c34b 100644 (file)
--- a/target/linux/ramips/dts/HPM.dts
+++ b/target/linux/ramips/dts/HPM.dts
@@ -2,58 +2,68 @@
 
 #include "rt3883.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "HPM", "ralink,rt3883-soc";
+       compatible = "omnima,hpm", "ralink,rt3883-soc";
        model = "Omnima HPM";
 
+       aliases {
+               led-boot = &led_status;
+               led-failsafe = &led_status;
+               led-running = &led_status;
+               led-upgrade = &led_status;
+       };
+
        chosen {
                bootargs = "console=ttyS0,115200";
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <100>;
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 14 0>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power {
                        label = "hpm:orange:power";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
                };
 
-               status {
+               led_status: status {
                        label = "hpm:green:status";
-                       gpios = <&gpio0 21 1>;
+                       gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
                };
 
                eth {
                        label = "hpm:green:eth";
-                       gpios = <&gpio0 20 1>;
+                       gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                };
 
                eth2 {
                        label = "hpm:red:eth";
-                       gpios = <&gpio0 18 1>;
+                       gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
                        label = "hpm:green:wifi";
-                       gpios = <&gpio0 17 1>;
+                       gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
                };
 
                wifi2 {
                        label = "hpm:red:wifi";
-                       gpios = <&gpio0 19 1>;
+                       gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -65,13 +75,13 @@
                usb0 {
                        gpio-export,name = "usb0";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 2 0>;
+                       gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
                };
 
                usb1 {
                        gpio-export,name = "usb1";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 1 0>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
                };
        };
 };
@@ -83,30 +93,35 @@
                compatible = "jedec,spi-nor";
                spi-max-frequency = <25000000>;
                reg = <0>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               partition@0 {
-                       reg = <0x0 0x0030000>;
-                       label = "u-boot";
-                       read-only;
-               };
-
-               partition@30000 {
-                       reg = <0x00030000 0x00010000>;
-                       label = "config";
-                       read-only;
-               };
-
-               factory: partition@40000 {
-                       reg = <0x00040000 0x00010000>;
-                       label = "factory";
-                       read-only;
-               };
 
-               partition@50000 {
-                       reg = <0x00050000 0x00fb0000>;
-                       label = "firmware";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               reg = <0x0 0x0030000>;
+                               label = "u-boot";
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               reg = <0x00030000 0x00010000>;
+                               label = "config";
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               reg = <0x00040000 0x00010000>;
+                               label = "factory";
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               reg = <0x00050000 0x00fb0000>;
+                               label = "firmware";
+                       };
                };
        };
 };