ramips: fix size-cells on spi nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / RT-G32-B1.dts

diff --git a/target/linux/ramips/dts/RT-G32-B1.dts b/target/linux/ramips/dts/RT-G32-B1.dts
index 9a5cab45b88d1d388fa15f7b83116858203df771..ab8e3fdad3c12e921adc0e3c50a0e14931efa875 100644 (file)
--- a/target/linux/ramips/dts/RT-G32-B1.dts
+++ b/target/linux/ramips/dts/RT-G32-B1.dts
@@ -1,31 +1,41 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
 
 / {
        compatible = "RT-G32-B1", "ralink,rt3050-soc";
        model = "Asus RT-G32 B1";
 
-       palmbus@10000000 {
-               sysc@0 {
-                       ralink,pinmux = "i2c", "spi", "uartlite", "jtag", "mdio", "sdram", "rgmii";
-                       ralink,uartmux = "gpio";
-                       ralink,wdtmux = <1>;
+       gpio-keys-polled {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <20>;
+
+               reset {
+                       label = "reset";
+                       gpios = <&gpio0 10 1>;
+                       linux,code = <0x198>;
                };
 
-               gpio0: gpio@600 {
-                       status = "okay";
+               wps {
+                       label = "wps";
+                       gpios = <&gpio0 0 1>;
+                       linux,code = <0x211>;
                };
+       };
+};
 
-               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>;
+&spi0 {
+       status = "okay";
+
+       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";
@@ -39,7 +49,7 @@
                        read-only;
                };
 
-               partition@40000 {
+               devconf: partition@40000 {
                        label = "devconf";
                        reg = <0x40000 0x10000>;
                        read-only;
@@ -49,37 +59,26 @@
                        label = "firmware";
                        reg = <0x50000 0x3b0000>;
                };
-                       };
-               };
        };
+};
 
-       ethernet@10100000 {
-               status = "okay";
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       esw@10110000 {
-               status = "okay";
-               ralink,portmap = <0x2f>;
-       };
+&ethernet {
+       mtd-mac-address = <&devconf 0x4>;
+};
 
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <20>;
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 10 1>;
-                       linux,code = <0x198>;
-               };
-               wps {
-                       label = "wps";
-                       gpios = <&gpio0 0 1>;
-                       linux,code = <0x211>;
-               };
-       };
+&esw {
+       mediatek,portmap = <0x2f>;
+};
 
-       wmac@10180000 {
-               status = "okay";
-       };
+&wmac {
+       ralink,mtd-eeprom = <&devconf 0>;
 };