/dts-v1/;
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
 
 #include "mt7622.dtsi"
 #include "mt6380.dtsi"
        leds {
                compatible = "gpio-leds";
 
-               wireless_amber {
+               led-0 {
                        label = "amber:wireless";
                        gpios = <&pio 2 GPIO_ACTIVE_HIGH>;
+                       color = <LED_COLOR_ID_AMBER>;
+                       function = LED_FUNCTION_WLAN;
                };
 
-               power_amber: power_amber {
+               power_amber: led-1 {
                        label = "amber:power";
                        gpios = <&pio 3 GPIO_ACTIVE_LOW>;
+                       color = <LED_COLOR_ID_AMBER>;
+                       function = LED_FUNCTION_POWER;
                };
 
-               power_green: power_green {
+               power_green: led-2 {
                        label = "green:power";
                        gpios = <&pio 4 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_POWER;
                };
 
-               wireless_green {
+               led-3 {
                        label = "green:wireless";
                        gpios = <&pio 15 GPIO_ACTIVE_HIGH>;
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_WLAN;
                };
 
-               internet {
+               led-4 {
                        label = "green:internet";
                        gpios = <&pio 19 GPIO_ACTIVE_HIGH>;
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_WAN;
                };
 
-               router {
+               led-5 {
                        label = "green:router";
                        gpios = <&pio 20 GPIO_ACTIVE_HIGH>;
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_INDICATOR;
                };
        };
 
        keys {
                compatible = "gpio-keys";
-               poll-interval = <100>;
 
-               reset {
+               key-reset {
                        label = "reset";
                        gpios = <&pio 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                /* GPIO 1 and 16 are a tri-state switch button with
                 * ROUTER / AP / WB.
                 */
-               router {
+               key-router {
                        label = "router";
                        gpios = <&pio 1 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                        linux,input-type = <EV_SW>;
                };
 
-               bridge {
+               key-bridge {
                        label = "wb";
                        gpios = <&pio 16 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_1>;
                };
 
                /* GPIO 18 is a switch button with AUTO / MANUAL. */
-               manual {
+               key-manual {
                        label = "manual";
                        gpios = <&pio 18 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_2>;
                        linux,input-type = <EV_SW>;
                };
 
-               wps {
+               key-wps {
                        label = "wps";
                        gpios = <&pio 102 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;