ramips: dts: Unify naming of gpio-led nodes

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / AR670W.dts

diff --git a/target/linux/ramips/dts/AR670W.dts b/target/linux/ramips/dts/AR670W.dts
index 0e29d89f2d9cbec517180007c5e0287f431ccba4..96e4a8cbe26ed2054dd837d2338c99404a3888f1 100644 (file)
--- a/target/linux/ramips/dts/AR670W.dts
+++ b/target/linux/ramips/dts/AR670W.dts
@@ -1,105 +1,116 @@
 /dts-v1/;
 
-/include/ "rt2880.dtsi"
+#include "rt2880.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-       compatible = "AR670W", "ralink,rt2880-soc";
+       compatible = "airlink101,ar670w", "ralink,rt2880-soc";
        model = "Airlink101 AR670W";
 
-       palmbus@300000 {
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "uartlite";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@400000 {
-               status = "okay";
-               mtd-mac-address = <&factory 0x2004>;
-
-               port@0 {
-                       phy-handle = <&phy0>;
-                       phy-mode = "mii";
-               };
-
-               mdio-bus {
-                       status = "okay";
-
-                       phy0: ethernet-phy@0 {
-                               phy-mode = "mii";
-                               reg = <0>;
-                       };
-               };
-       };
-
-       wmac@480000 {
-               status = "okay";
-               ralink,mtd-eeprom = <&factory 0x2000>;
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        cfi@bdc00000 {
                compatible = "cfi-flash";
                reg = <0xbc400000 0x800000>;
                bank-width = <2>;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
-               u-boot@0 {
-                       reg = <0x0 0x30000>;
-                       label = "u-boot";
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               factory: factory@30000 {
-                       reg = <0x30000 0x10000>;
-                       label = "factory";
-                       read-only;
-               };
+                       partition@0 {
+                               reg = <0x0 0x30000>;
+                               label = "u-boot";
+                               read-only;
+                       };
 
-               firmware@40000 {
-                       reg = <0x40000 0x3c0000>;
-                       label = "firmware";
+                       factory: partition@30000 {
+                               reg = <0x30000 0x10000>;
+                               label = "factory";
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               compatible = "lzma";
+                               reg = <0x40000 0x3c0000>;
+                               label = "firmware";
+                       };
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               status {
+               led_power: power {
                        label = "ar670w:green:power";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
                wpsblue {
                        label = "ar670w:blue:wps";
-                       gpios = <&gpio0 13 1>;
+                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <100>;
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 0 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 9 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 };
+
+&gpio0 {
+       status = "okay";
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "uartlite";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       status = "okay";
+       mtd-mac-address = <&factory 0x2004>;
+
+       port@0 {
+               phy-handle = <&phy0>;
+               phy-mode = "mii";
+       };
+
+       mdio-bus {
+               status = "okay";
+
+               phy0: ethernet-phy@0 {
+                       phy-mode = "mii";
+                       reg = <0>;
+               };
+       };
+};
+
+&wmac {
+       status = "okay";
+       ralink,mtd-eeprom = <&factory 0x2000>;
+};