ramips: fix size-cells on spi nodes

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

diff --git a/target/linux/ramips/dts/WIZARD8800.dts b/target/linux/ramips/dts/WIZARD8800.dts
index e4d3f5e98d3e3d8079e2c7f30eda7b0a8569bdbd..bbfa61085d2b675c5ffe6105f6caf24694a04828 100644 (file)
--- a/target/linux/ramips/dts/WIZARD8800.dts
+++ b/target/linux/ramips/dts/WIZARD8800.dts
@@ -1,83 +1,81 @@
 /dts-v1/;
 
-/include/ "rt5350.dtsi"
+#include "rt5350.dtsi"
 
 / {
        compatible = "WIZARD8800", "ralink,rt5350-soc";
        model = "EASYACC WI-STOR WIZARD 8800";
+};
+
+&gpio0 {
+       status = "okay";
+};
+
+&gpio1 {
+       status = "okay";
+};
 
-       palmbus@10000000 {
-               gpio1@638 {
-                       status = "okay";
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               linux,modalias = "m25p80", "w25q32";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
                };
 
-               gpio2@660 {
-                       status = "okay";
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
                };
 
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "w25q32";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "w25q32";
-                               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 0x7b0000>;
-                               };
-                       };
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
                };
-       };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
                };
        };
+};
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
 
-       ehci@101c0000 {
-               status = "okay";
-       };
+&esw {
+       mediatek,portmap = <0x2f>;
+};
 
-       ohci@101c1000 {
-               status = "okay";
-       };
+&ehci {
+       status = "okay";
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
+&ohci {
+       status = "okay";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
 };