ramips: specify "firmware" partition format

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / RT-G32-B1.dts

diff --git a/target/linux/ramips/dts/RT-G32-B1.dts b/target/linux/ramips/dts/RT-G32-B1.dts
index d392bb3545aa4d2917b1859093f2451eeea7366f..581941c846706fe1182908b361373f482db2b27a 100644 (file)
--- a/target/linux/ramips/dts/RT-G32-B1.dts
+++ b/target/linux/ramips/dts/RT-G32-B1.dts
@@ -2,27 +2,26 @@
 
 #include "rt3050.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "RT-G32-B1", "ralink,rt3050-soc";
+       compatible = "asus,rt-g32-b1", "ralink,rt3050-soc";
        model = "Asus RT-G32 B1";
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 10 1>;
+                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -32,34 +31,38 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80", "mx25l3205d";
                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "devdata";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
-
-               devconf: partition@40000 {
-                       label = "devconf";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
-
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x3b0000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "devdata";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       devconf: partition@40000 {
+                               label = "devconf";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0x3b0000>;
+                       };
                };
        };
 };