ramips: fix size-cells on spi nodes

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

diff --git a/target/linux/ramips/dts/MT7620a_MT7530.dts b/target/linux/ramips/dts/MT7620a_MT7530.dts
index 784cc98aa43062f51078f347a75d58cbbad5fb21..5885ed045d0977b52a8f7224d6b43a61464301b5 100644 (file)
--- a/target/linux/ramips/dts/MT7620a_MT7530.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7530.dts
@@ -1,119 +1,117 @@
 /dts-v1/;
 
-/include/ "mt7620a.dtsi"
+#include "mt7620a.dtsi"
 
 / {
        compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
        model = "Ralink MT7620a + MT7530 evaluation board";
+};
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "s25fl064k";
-                               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>;
-                               };
-                       };
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               linux,modalias = "m25p80", "s25fl064k";
+               spi-max-frequency = <10000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x30000>;
+                       read-only;
                };
-       };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartf";
-                               ralink,function = "gpio";
-                       };
+               partition@30000 {
+                       label = "u-boot-env";
+                       reg = <0x30000 0x10000>;
+                       read-only;
                };
-       };
-
-       ethernet@10100000 {
-               status = "okay";
-               pinctrl-names = "default";
-               pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
-               mediatek,portmap = "llllw";
 
-               port@5 {
-                       status = "okay";
-                       mediatek,fixed-link = <1000 1 1 1>;
-                       phy-mode = "rgmii";
+               factory: partition@40000 {
+                       label = "factory";
+                       reg = <0x40000 0x10000>;
+                       read-only;
                };
 
-               mdio-bus {
-                       status = "okay";
-
-                       phy0: ethernet-phy@0 {
-                               reg = <0>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy1: ethernet-phy@1 {
-                               reg = <1>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy2: ethernet-phy@2 {
-                               reg = <2>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy3: ethernet-phy@3 {
-                               reg = <3>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy1f: ethernet-phy@1f {
-                               reg = <0x1f>;
-                               phy-mode = "rgmii";
-                       };
+               partition@50000 {
+                       label = "firmware";
+                       reg = <0x50000 0x7b0000>;
                };
        };
+};
 
-       gsw@10110000 {
-               mediatek,port4 = "gmac";
-               mediatek,mt7530 = <1>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       pcie@10140000 {
-               status = "okay";
-       };
+&ethernet {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+       mediatek,portmap = "llllw";
 
-       ehci@101c0000 {
+       port@5 {
                status = "okay";
+               mediatek,fixed-link = <1000 1 1 1>;
+               phy-mode = "rgmii";
        };
 
-       ohci@101c1000 {
+       mdio-bus {
                status = "okay";
+
+               phy0: ethernet-phy@0 {
+                       reg = <0>;
+                       phy-mode = "rgmii";
+               };
+
+               phy1: ethernet-phy@1 {
+                       reg = <1>;
+                       phy-mode = "rgmii";
+               };
+
+               phy2: ethernet-phy@2 {
+                       reg = <2>;
+                       phy-mode = "rgmii";
+               };
+
+               phy3: ethernet-phy@3 {
+                       reg = <3>;
+                       phy-mode = "rgmii";
+               };
+
+               phy4: ethernet-phy@4 {
+                       reg = <4>;
+                       phy-mode = "rgmii";
+               };
+
+               phy1f: ethernet-phy@1f {
+                       reg = <0x1f>;
+                       phy-mode = "rgmii";
+               };
        };
 };
+
+&gsw {
+       mediatek,port4 = "gmac";
+       mediatek,mt7530 = <1>;
+};
+
+&pcie {
+       status = "okay";
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};