ramips: Change all '/include/' clauses to '#include' so preprocessing can

[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 aa98991ae1a84c8573ddcce2e4fb428e6fc609eb..fcc8c04de84f451dfe756081eda1ceab1b56a716 100644 (file)
--- a/target/linux/ramips/dts/M2M.dts
+++ b/target/linux/ramips/dts/M2M.dts
@@ -1,26 +1,23 @@
 /dts-v1/;
 
-/include/ "rt5350.dtsi"
+#include "rt5350.dtsi"
 
 / {
        compatible = "M2M", "ralink,rt5350-soc";
        model = "Intenso Memory 2 Move";
 
        chosen {
-               bootargs = "console=ttyS1,57600n8 root=/dev/mtdblock5";
+               bootargs = "console=ttyS0,57600n8 root=/dev/mtdblock5";
        };
 
        palmbus@10000000 {
-               uart@500 {
-                       status = "okay";
-               };
-
                spi@b00 {
                        status = "okay";
+
                        m25p80@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "mx25l6405d";
+                               compatible = "jedec,spi-nor";
                                reg = <0 0>;
                                linux,modalias = "m25p80", "mx25l6405d";
                                spi-max-frequency = <10000000>;
@@ -54,7 +51,7 @@
        pinctrl {
                state_default: pinctrl0 {
                        gpio {
-                               ralink,group = "i2c", "jtag", "uartf";
+                               ralink,group = "i2c", "uartf";
                                ralink,function = "gpio";
                        };
                };
@@ -62,10 +59,12 @@
 
        gpio-leds {
                compatible = "gpio-leds";
+
                wifi {
                        label = "m2m:blue:wifi";
                        gpios = <&gpio0 7 1>;
                };
+
                wan {
                        label = "m2m:green:wan";
                        gpios = <&gpio0 12 1>;
@@ -73,21 +72,21 @@
        };
 
        gpio-keys-polled {
-               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>;
-                       };
-                       reset {
-                               label = "reset";
-                               gpios = <&gpio0 10 1>;
-                               linux,code = <0x198>;
-                       };
+
+               power {
+                       label = "power";
+                       gpios = <&gpio0 1 1>;
+                       linux,code = <0x116>;
+               };
+
+               reset {
+                       label = "reset";
+                       gpios = <&gpio0 10 1>;
+                       linux,code = <0x198>;
                };
        };
 
@@ -96,7 +95,7 @@
        };
 
        esw@10110000 {
-               ralink,portmap = <0x2f>;
+               mediatek,portmap = <0x2f>;
        };
 
        ehci@101c0000 {