ramips: fix size-cells on spi nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / DIR-620-D1.dts

diff --git a/target/linux/ramips/dts/DIR-620-D1.dts b/target/linux/ramips/dts/DIR-620-D1.dts
index e4eeb3ee6d5b70d212c8be9f31eeefca4dfc5fa6..5cf330e66bbec23e96c35ae3a2e1f77a3e1fba80 100644 (file)
--- a/target/linux/ramips/dts/DIR-620-D1.dts
+++ b/target/linux/ramips/dts/DIR-620-D1.dts
@@ -1,85 +1,21 @@
 /dts-v1/;
 
-/include/ "rt3352.dtsi"
+#include "rt3352.dtsi"
 
 / {
        compatible = "DIR-620-D1", "ralink,rt3352-soc";
        model = "D-Link DIR-620 D1";
 
-       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 = "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>;
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "uartf";
-                               ralink,function = "gpio";
-                       };
-                       rgmii {
-                               ralink,group = "rgmii";
-                               ralink,function = "rgmii";
-                       };
-                       mdio {
-                               ralink,group = "mdio";
-                               ralink,function = "mdio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
-       };
-
-       esw@10110000 {
-               ralink,portmap = <0x2f>;
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
+
                status {
-                       label = "d-link:green:status";
+                       label = "dir-620-d1:green:status";
                        gpios = <&gpio0 9 1>;
                };
+
                wifi {
-                       label = "d-link:green:wifi";
+                       label = "dir-620-d1:green:wifi";
                        gpios = <&gpio0 17 1>;
                };
        };
@@ -89,18 +25,86 @@
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
+
                reset_wps {
                        label = "reset_wps";
                        gpios = <&gpio0 7 1>;
                        linux,code = <0x198>;
                };
        };
+};
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               linux,modalias = "m25p80", "mx25l6405d";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
+               };
 
-       ehci@101c0000 {
-               status = "okay";
+               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>;
+               };
        };
+};
 
-       ohci@101c1000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "uartf";
+                       ralink,function = "gpio";
+               };
+
+               rgmii {
+                       ralink,group = "rgmii";
+                       ralink,function = "rgmii";
+               };
+
+               mdio {
+                       ralink,group = "mdio";
+                       ralink,function = "mdio";
+               };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+       mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};