ramips: fix size-cells on spi nodes

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

diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/3G300M.dts
index 38f4e9f122a1f612bc7da6b12fad64ad7a31c6f2..df770d83d5110b063b4ac0126a0cb06029a005ed 100644 (file)
--- a/target/linux/ramips/dts/3G300M.dts
+++ b/target/linux/ramips/dts/3G300M.dts
@@ -1,87 +1,41 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
 
 / {
        compatible = "3G300M", "ralink,rt3052-soc";
        model = "Tenda 3G300M";
 
-       memorydetect {
-               ralink,memory = <0x0 0x200000 0x4000000>;
-       };
-
-       palmbus@10000000 {
-               sysc@0 {
-                       ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii";
-                       ralink,gpiomux = "jtag";
-                       ralink,uartmux = "gpio";
-                       ralink,wdtmux = <1>;
-               };
-
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
-               spi@b00 {
-                       status = "okay";
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "mx25l3205d";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l3205d";
-                               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 0x3b0000>;
-               };
-                       };
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
+
                3grouter {
-                       label = "tenda:blue:3grouter";
+                       label = "3g300m:blue:3grouter";
                        gpios = <&gpio0 11 1>;
                };
+
                ap {
-                       label = "tenda:blue:ap";
+                       label = "3g300m:blue:ap";
                        gpios = <&gpio0 12 1>;
                };
+
                wisprouter {
-                       label = "tenda:blue:wisprouter";
+                       label = "3g300m:blue:wisprouter";
                        gpios = <&gpio0 9 1>;
                };
+
                wirelessrouter {
-                       label = "tenda:blue:wirelessrouter";
+                       label = "3g300m:blue:wirelessrouter";
                        gpios = <&gpio0 13 1>;
                };
+
                3g {
-                       label = "tenda:blue:3g";
+                       label = "3g300m:blue:3g";
                        gpios = <&gpio0 7 1>;
                };
+
                wpsreset {
-                       label = "tenda:blue:wpsreset";
+                       label = "3g300m:blue:wpsreset";
                        gpios = <&gpio0 14 1>;
                };
        };
@@ -91,32 +45,78 @@
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
+
                reset {
                        label = "reset";
                        gpios = <&gpio0 0 1>;
                        linux,code = <0x198>;
                };
+
                mode {
                        label = "mode";
                        gpios = <&gpio0 10 1>;
                        linux,code = <0x100>;
                };
        };
+};
 
-       ethernet@10100000 {
-               status = "okay";
-       };
+&spi0 {
+       status = "okay";
 
-       esw@10110000 {
-               status = "okay";
-               ralink,portmap = <0x2f>;
-       };
+       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 = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
+               };
 
-       wmac@10180000 {
-               status = "okay";
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x3b0000>;
+               };
        };
+};
 
-       otg@101c0000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
+};