ramips: move partitions into partition table node

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / M2M.dts

diff --git a/target/linux/ramips/dts/M2M.dts b/target/linux/ramips/dts/M2M.dts
index 74d66d5ff5d769da88cefcadd00d5c8441715dd9..2e9092a4bb7ae7c05c328bc6db5f72e0017adfc3 100644 (file)
--- a/target/linux/ramips/dts/M2M.dts
+++ b/target/linux/ramips/dts/M2M.dts
@@ -2,12 +2,17 @@
 
 #include "rt5350.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "M2M", "ralink,rt5350-soc";
+       compatible = "intenso,memory2move", "ralink,rt5350-soc";
        model = "Intenso Memory 2 Move";
 
+       aliases {
+               led-status = &led_wifi;
+       };
+
        chosen {
                bootargs = "console=ttyS0,57600n8 root=/dev/mtdblock5";
        };
@@ -15,32 +20,30 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               wifi {
+               led_wifi: wifi {
                        label = "m2m:blue:wifi";
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "m2m:green:wan";
-                       gpios = <&gpio0 12 1>;
+                       gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
        };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                power {
                        label = "power";
-                       gpios = <&gpio0 1 1>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 10 1>;
+                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -50,33 +53,37 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       label = "Bootloader";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "Config";
-                       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 = "Bootloader";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "Config";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               label = "Factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x7b0000>;
+                       };
                };
        };
 };