ramips: dts: Unify naming of gpio-led nodes

[openwrt/openwrt.git] / target / linux / ramips / dts / MLW221.dts

diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/MLW221.dts
index 7ac130f111f7379a2ee20951c138cf6412c0c11b..815370e6fd1e8d1d1569fc1178ce0c704b0e463a 100644 (file)
--- a/target/linux/ramips/dts/MLW221.dts
+++ b/target/linux/ramips/dts/MLW221.dts
@@ -2,40 +2,48 @@
 
 #include "mt7620n.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "mlw221", "ralink,mt7620n-soc";
+       compatible = "kingston,mlw221", "ralink,mt7620n-soc";
        model = "Kingston MLW221";
 
-       gpio-leds {
+       aliases {
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
+       };
+
+       leds {
                compatible = "gpio-leds";
 
-               system {
+               led_system: system {
                        label = "mlw221:blue:system";
-                       gpios = <&gpio2 3 1>;
+                       gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
                        label = "mlw221:blue:wifi";
-                       gpios = <&gpio3 0 1>;
+                       gpios = <&gpio3 0 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 1 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
 
                system {
                        label = "system";
-                       gpios = <&gpio0 2 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RFKILL>;
                };
        };
 };
@@ -56,39 +64,43 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               reg = <0 0>;
-               linux,modalias = "m25p80", "s25fl129p1";
+               reg = <0>;
                spi-max-frequency = <10000000>;
 
-               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 {
-                       label = "firmware";
-                       reg = <0x50000 0xf60000>;
-               };
-
-               partition@fb0000 {
-                       label = "user-config";
-                       reg = <0xfb0000 0x50000>;
+               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 0xf60000>;
+                       };
+
+                       partition@fb0000 {
+                               label = "user-config";
+                               reg = <0xfb0000 0x50000>;
+                       };
                };
        };
 };