ramips: specify "firmware" partition format

[openwrt/staging/stintel.git] / target / linux / ramips / dts / WMR-300.dts

diff --git a/target/linux/ramips/dts/WMR-300.dts b/target/linux/ramips/dts/WMR-300.dts
index 9f9d5b75926b0e91014af58f81197a7fb5e4f0a5..3b4551107a001253e31a0d74fde2deb571a2a4a7 100644 (file)
--- a/target/linux/ramips/dts/WMR-300.dts
+++ b/target/linux/ramips/dts/WMR-300.dts
@@ -2,45 +2,53 @@
 
 #include "mt7620n.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
        compatible = "buffalo,wmr-300", "ralink,mt7620n-soc";
        model = "Buffalo WMR-300";
 
+       aliases {
+               led-boot = &led_status;
+               led-failsafe = &led_status;
+               led-running = &led_status;
+               led-upgrade = &led_status;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
 
                aoss1 {
                        label = "wmr-300:red:aoss";
-                       gpios = <&gpio2 1 1>;
+                       gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                };
 
                aoss2 {
                        label = "wmr-300:green:aoss";
-                       gpios = <&gpio2 2 1>;
+                       gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
                };
 
-               power {
+               led_status: status {
                        label = "wmr-300:green:status";
-                       gpios = <&gpio2 4 1>;
+                       gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
                };
        };
 
        gpio-keys-polled {
                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>;
                };
 
                aoss {
                        label = "aoss";
-                       gpios = <&gpio0 2 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 };
@@ -53,34 +61,38 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               reg = <0 0>;
-               linux,modalias = "m25p80", "en25q64";
+               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 0x7b0000>;
+               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 0x7b0000>;
+                       };
                };
        };
 };