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 41910374c978238386424bf597d13dafb6b4b94a..2e9092a4bb7ae7c05c328bc6db5f72e0017adfc3 100644 (file)
--- a/target/linux/ramips/dts/M2M.dts
+++ b/target/linux/ramips/dts/M2M.dts
@@ -1,107 +1,118 @@
 /dts-v1/;
 
-/include/ "rt5350.dtsi"
+#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";
 
-       chosen {
-               bootargs = "console=ttyS0,57600n8 root=/dev/mtdblock5";
-       };
-
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "mx25l6405d";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l6405d";
-                               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>;
-                               };
-                       };
-               };
+       aliases {
+               led-status = &led_wifi;
        };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
+       chosen {
+               bootargs = "console=ttyS0,57600n8 root=/dev/mtdblock5";
        };
 
        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>;
-                       linux,code = <0x116>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_POWER>;
                };
+
                reset {
                        label = "reset";
-                       gpios = <&gpio0 10 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
        };
+};
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x28>;
-       };
+&spi0 {
+       status = "okay";
 
-       esw@10110000 {
-               ralink,portmap = <0x2f>;
-       };
+       m25p80@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <10000000>;
 
-       ehci@101c0000 {
-               status = "okay";
-       };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-       ohci@101c1000 {
-               status = "okay";
+                       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>;
+                       };
+               };
        };
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0x0>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0x0>;
+};