ramips: fix size-cells on spi nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / WSR-1166.dts

diff --git a/target/linux/ramips/dts/WSR-1166.dts b/target/linux/ramips/dts/WSR-1166.dts
index 3d955a7367a1b46f4b197edf40afd669f67882b1..8f9991f4a7f093e67c26c2e2334f6468b6b36bdd 100644 (file)
--- a/target/linux/ramips/dts/WSR-1166.dts
+++ b/target/linux/ramips/dts/WSR-1166.dts
@@ -1,12 +1,13 @@
 /dts-v1/;
 
-/include/ "mt7621.dtsi"
+#include "mt7621.dtsi"
 
 / {
        compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
        model = "Buffalo WSR-1166DHP";
 
        memory@0 {
+               device_type = "memory";
                reg = <0x0 0x8000000>;
        };
 
@@ -14,100 +15,46 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       palmbus@1E000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "mx25l12805d";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80";
-                               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 0x7c0000>;
-                               };
-
-                               partition@810000 {
-                                       label = "firmware2";
-                                       reg = <0x810000 0x7c0000>;
-                               };
-
-                               partition@fd00000 {
-                                       label = "usercfg";
-                                       reg = <0xfd0000 0x10000>;
-                               };
-
-                               partition@fe00000 {
-                                       label = "board_data";
-                                       reg = <0xfe0000 0x10000>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
+
                internet_g {
-                       label = "buffalo:green:internet";
+                       label = "wsr-1166:green:internet";
                        gpios = <&gpio1 9 1>;
                };
+
                router_g {
-                       label = "buffalo:green:router";
+                       label = "wsr-1166:green:router";
                        gpios = <&gpio1 10 1>;
                };
+
                router_o {
-                       label = "buffalo:orange:router";
+                       label = "wsr-1166:orange:router";
                        gpios = <&gpio1 11 1>;
                };
+
                internet_o {
-                       label = "buffalo:orange:internet";
+                       label = "wsr-1166:orange:internet";
                        gpios = <&gpio1 12 1>;
                };
+
                wifi_o {
-                       label = "buffalo:orange:wifi";
+                       label = "wsr-1166:orange:wifi";
                        gpios = <&gpio1 13 1>;
                };
+
                power {
-                       label = "buffalo:green:power";
-                       gpios = <&gpio0 14 1>;
+                       label = "wsr-1166:green:power";
+                       gpios = <&gpio1 14 1>;
                };
+
                diag {
-                       label = "buffalo:orange:diag";
+                       label = "wsr-1166:orange:diag";
                        gpios = <&gpio1 15 1>;
                };
+
                wifi_g {
-                       label = "buffalo:green:wifi";
+                       label = "wsr-1166:green:wifi";
                        gpios = <&gpio1 16 1>;
                };
        };
@@ -117,33 +64,39 @@
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
+
                power {
                        label = "power";
                        gpios = <&gpio0 18 1>;
                        linux,code = <0x74>;
                };
+
                reset {
                        label = "reset";
                        gpios = <&gpio0 3 1>;
                        linux,code = <0x198>;
                };
+
                aoss {
                        label = "aoss";
                        gpios = <&gpio0 6 1>;
                        linux,code = <0x211>;
                };
+
                auto {
                        label = "mode";
                        gpios = <&gpio0 7 0>;
                        linux,code = <0x100>;
                        linux,input-type = <5>; /* EV_SW */
                };
+
                ap {
                        label = "ap";
                        gpios = <&gpio0 10 0>;
                        linux,code = <0x100>;
                        linux,input-type = <5>; /* EV_SW */
                };
+
                router {
                        label = "router";
                        gpios = <&gpio0 12 0>;
@@ -156,26 +109,76 @@
                compatible = "gpio-poweroff";
                gpios = <&gpio0 0 1>;
        };
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               linux,modalias = "m25p80";
+               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 0xf90000>;
+               };
+
+               partition@fe0000 {
+                       label = "board_data";
+                       reg = <0xfe0000 0x20000>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&pcie {
+       status = "okay";
+
+       pcie0 {
+               mt76@0,0 {
+                       reg = <0x0000 0 0 0 0>;
+                       device_type = "pci";
+                       mediatek,mtd-eeprom = <&factory 0x8000>;
+                       mediatek,2ghz = <0>;
+               };
+       };
 
-       pcie@1e140000 {
-               status = "okay";
-
-               pcie0 {
-                       mt76@0,0 {
-                               reg = <0x0000 0 0 0 0>;
-                               device_type = "pci";
-                               mediatek,mtd-eeprom = <&factory 0x8000>;
-                               mediatek,2ghz = <0>;
-                       };
-               };
-
-               pcie1 {
-                       mt76@1,0 {
-                               reg = <0x0000 0 0 0 0>;
-                               device_type = "pci";
-                               mediatek,mtd-eeprom = <&factory 0x0000>;
-                               mediatek,5ghz = <0>;
-                       };
+       pcie1 {
+               mt76@1,0 {
+                       reg = <0x0000 0 0 0 0>;
+                       device_type = "pci";
+                       mediatek,mtd-eeprom = <&factory 0x0000>;
+                       mediatek,5ghz = <0>;
                };
        };
 };