ramips: cleanup dts files of mt7621 based boards

Fix a typo in mt7621.dtsi compatible string. Disable spi, sdhci and pci
in mt7621.dtsi and enable the nodes in the indiviual board dts files.
The nodes require further device specific configuration anyway.

Remove the m25p80@0 spi child node from mt7621.dtsi and add the
chunked-io parameter to the individual board dts files. Fix the spi
flash compatible string for the WNDR3700V5.

Drop the mt7621-eval-board compatible string for all boards which are
not the eval board.

Drop the linux,modalias parameter from spi flash node.

Remove the xhci node from board files, it is already enabled in dtsi.
Disable xhci for boards not having usb ports populated.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts
index 5154a4dedb6e245b4f627601175d7ab0f1b7098c..98c9d8a0bb77790cf7c3433b4116a0bd1e8aae53 100644 (file)
--- a/target/linux/ramips/dts/DIR-860L-B1.dts
+++ b/target/linux/ramips/dts/DIR-860L-B1.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
        model = "D-Link DIR-860L B1";
 
        memory@0 {
@@ -69,8 +68,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/FIREWRT.dts b/target/linux/ramips/dts/FIREWRT.dts
index b318e6808bc7b838226d5b6ae2ea4b28406e8bff..1871de99be9606c72fbe9422d2eb91e15e5815c2 100644 (file)
--- a/target/linux/ramips/dts/FIREWRT.dts
+++ b/target/linux/ramips/dts/FIREWRT.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "Firefly FireWRT";
 
        memory@0 {
@@ -58,8 +57,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/MT7621.dts b/target/linux/ramips/dts/MT7621.dts
index 4013f3c7b53aaf93400b8182b8c1f1deda85cd07..83d0c86c183e729bb722d63d1b20db8c09d6dda1 100644 (file)
--- a/target/linux/ramips/dts/MT7621.dts
+++ b/target/linux/ramips/dts/MT7621.dts
@@ -14,35 +14,33 @@
        chosen {
                bootargs = "console=ttyS0,57600";
        };
+};
 
-       nand@1e003000 {
-               partition@0 {
-                       label = "uboot";
-                       reg = <0x00000 0x80000>; /* 64 KB */
-               };
+&nand {
+       status = "okay";
 
-               partition@80000 {
-                       label = "uboot_env";
-                       reg = <0x80000 0x80000>; /* 64 KB */
-               };
+       partition@0 {
+               label = "uboot";
+               reg = <0x00000 0x80000>; /* 64 KB */
+       };
 
-               partition@100000 {
-                       label = "factory";
-                       reg = <0x100000 0x40000>;
-               };
+       partition@80000 {
+               label = "uboot_env";
+               reg = <0x80000 0x80000>; /* 64 KB */
+       };
 
-               partition@140000 {
-                       label = "rootfs";
-                       reg = <0x140000 0xec0000>;
-               };
+       partition@100000 {
+               label = "factory";
+               reg = <0x100000 0x40000>;
        };
-};
 
-&sdhci {
-       status = "okay";
+       partition@140000 {
+               label = "rootfs";
+               reg = <0x140000 0xec0000>;
+       };
 };
 
-&xhci {
+&sdhci {
        status = "okay";
 };
 

diff --git a/target/linux/ramips/dts/Newifi-D1.dts b/target/linux/ramips/dts/Newifi-D1.dts
index 07950baed8ff782b2eb4a6d558399235dd81c50a..2d128ac6d2e3cc306634491aea8c298bc7db0def 100644 (file)
--- a/target/linux/ramips/dts/Newifi-D1.dts
+++ b/target/linux/ramips/dts/Newifi-D1.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "Newifi-D1";
 
        memory@0 {
@@ -69,14 +68,11 @@
 
 &sdhci {
        status = "okay";
+
        pinctrl-names = "default";
        pinctrl-0 = <&sdhci_pins>;
 };
 
-&xhci {
-       status = "okay";
-};
-
 &spi0 {
        status = "okay";
 
@@ -85,8 +81,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";
@@ -139,8 +135,6 @@
        mtd-mac-address = <&factory 0xe000>;
 };
 
-
-
 &pinctrl {
        state_default: pinctrl0 {
                gpio {

diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts
index e278fc54d2cb7de5e410d91551fab4317a179ae4..9a0c713daa917a2e1205bafc6118ef3c9823aa92 100644 (file)
--- a/target/linux/ramips/dts/PBR-M1.dts
+++ b/target/linux/ramips/dts/PBR-M1.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "PBR-M1";
 
        memory@0 {
@@ -106,10 +105,6 @@
        pinctrl-0 = <&sdhci_pins>;
 };
 
-&xhci {
-       status = "okay";
-};
-
 &spi0 {
        status = "okay";
 
@@ -118,8 +113,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";
@@ -172,8 +167,6 @@
        mtd-mac-address = <&factory 0xe000>;
 };
 
-
-
 &pinctrl {
        state_default: pinctrl0 {
                gpio {

diff --git a/target/linux/ramips/dts/RB750Gr3.dts b/target/linux/ramips/dts/RB750Gr3.dts
index d39a2d113b4cabeb61647addfc30640c0ae68392..bf1c2ba495bc1634eb4f405e59d3d82fb5b4d640 100644 (file)
--- a/target/linux/ramips/dts/RB750Gr3.dts
+++ b/target/linux/ramips/dts/RB750Gr3.dts
@@ -1,11 +1,11 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
+
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "MikroTik RB750Gr3";
 
        memory@0 {
@@ -65,8 +65,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";
@@ -111,11 +111,3 @@
 &sdhci {
        status = "okay";
 };
-
-&xhci {
-       status = "okay";
-};
-
-&pcie {
-       status = "disabled";
-};

diff --git a/target/linux/ramips/dts/RE6500.dts b/target/linux/ramips/dts/RE6500.dts
index d34e857e61e3febb97264070723db254285fc24a..3fe875db1227d61a6eb12486ed6c091414d11cc4 100644 (file)
--- a/target/linux/ramips/dts/RE6500.dts
+++ b/target/linux/ramips/dts/RE6500.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "Linksys RE6500";
 
        memory@0 {
@@ -59,8 +58,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80", "en25q64";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";
@@ -121,3 +120,7 @@
 &ethernet {
        mtd-mac-address = <&factory 0x2e>;
 };
+
+&xhci {
+       status = "disabled";
+};

diff --git a/target/linux/ramips/dts/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index 9069f7cff23e89d635f5d1a4ad65aa38def3ea15..7be6e033c7927d302c465669c95124e4cff018b3 100644 (file)
--- a/target/linux/ramips/dts/SAP-G3200U3.dts
+++ b/target/linux/ramips/dts/SAP-G3200U3.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "STORYLiNK SAP-G3200U3";
 
        memory@0 {
@@ -54,8 +53,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80", "en25q64";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/SK-WB8.dts b/target/linux/ramips/dts/SK-WB8.dts
index b50de555dc7aef3c7bdfac030c148e0cfa608396..171e837c6a697a609c965437c86432cd1d8c7926 100644 (file)
--- a/target/linux/ramips/dts/SK-WB8.dts
+++ b/target/linux/ramips/dts/SK-WB8.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "SamKnows Whitebox 8";
 
        memory@0 {
@@ -57,8 +56,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/Timecloud.dts b/target/linux/ramips/dts/Timecloud.dts
index 2d60324f246b814e8f74c29c0aef541778496a43..535469a8a003c46b3b30e91158614be8be311211 100644 (file)
--- a/target/linux/ramips/dts/Timecloud.dts
+++ b/target/linux/ramips/dts/Timecloud.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "Thunder Timecloud";
 
        memory@0 {
@@ -54,14 +53,11 @@
 
 &sdhci {
        status = "okay";
+
        pinctrl-names = "default";
        pinctrl-0 = <&sdhci_pins>;
 };
 
-&xhci {
-       status = "okay";
-};
-
 &spi0 {
        status = "okay";
 
@@ -70,8 +66,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/UBNT-ERX.dts b/target/linux/ramips/dts/UBNT-ERX.dts
index 713519d5d9ef034cc2c2c68e6bb1873e67aac00f..0b2da95b30f0e181e1929502b8ef1aa50a684f69 100644 (file)
--- a/target/linux/ramips/dts/UBNT-ERX.dts
+++ b/target/linux/ramips/dts/UBNT-ERX.dts
@@ -5,7 +5,6 @@
 #include "mt7621.dtsi"
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "UBNT-ERX";
 
        memory@0 {
@@ -17,43 +16,6 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       nand@1e003000 {
-               status = "okay";
-
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x80000>;
-                       read-only;
-               };
-
-               partition@80000 {
-                       label = "u-boot-env";
-                       reg = <0x80000 0x60000>;
-                       read-only;
-               };
-
-               factory: partition@e0000 {
-                       label = "factory";
-                       reg = <0xe0000 0x60000>;
-               };
-
-               partition@140000 {
-                       label = "kernel1";
-                       reg = <0x140000 0x300000>;
-               };
-
-               partition@440000 {
-                       label = "kernel2";
-                       reg = <0x440000 0x300000>;
-               };
-
-               partition@740000 {
-                       label = "ubi";
-                       reg = <0x740000 0xf7c0000>;
-               };
-
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
@@ -72,6 +34,42 @@
        mtd-mac-address = <&factory 0x22>;
 };
 
+&nand {
+       status = "okay";
+
+       partition@0 {
+               label = "u-boot";
+               reg = <0x0 0x80000>;
+               read-only;
+       };
+
+       partition@80000 {
+               label = "u-boot-env";
+               reg = <0x80000 0x60000>;
+               read-only;
+       };
+
+       factory: partition@e0000 {
+               label = "factory";
+               reg = <0xe0000 0x60000>;
+       };
+
+       partition@140000 {
+               label = "kernel1";
+               reg = <0x140000 0x300000>;
+       };
+
+       partition@440000 {
+               label = "kernel2";
+               reg = <0x440000 0x300000>;
+       };
+
+       partition@740000 {
+               label = "ubi";
+               reg = <0x740000 0xf7c0000>;
+       };
+};
+
 &pinctrl {
        state_default: pinctrl0 {
                gpio {
@@ -81,27 +79,20 @@
        };
 };
 
-&sdhci {
-       status = "disabled";
-};
-
-&pcie {
-       status = "disabled";
-};
-
 &spi0 {
        /* This board has 2Mb spi flash soldered in and visible
           from manufacturer's firmware.
           But this SoC shares spi and nand pins,
           and current driver does't handle this sharing well */
        status = "disabled";
+
        m25p80@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <1>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "spi";
@@ -110,3 +101,7 @@
                };
        };
 };
+
+&xhci {
+       status = "disabled";
+};

diff --git a/target/linux/ramips/dts/VR500.dts b/target/linux/ramips/dts/VR500.dts
index 8b5d98fa697485629a16db774f7a57f086bdb42e..24bb188706479504edc52e863e2eb9ea7c055861 100644 (file)
--- a/target/linux/ramips/dts/VR500.dts
+++ b/target/linux/ramips/dts/VR500.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
        model = "Planex VR500";
 
        memory@0 {
@@ -40,10 +39,6 @@
        };
 };
 
-&xhci {
-       status = "okay";
-};
-
 &spi0 {
        status = "okay";
 
@@ -52,8 +47,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";
@@ -88,7 +83,3 @@
                };
        };
 };
-
-&pcie {
-       status = "disabled";
-};

diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index 2cad0ec344528e572406aca42a9531cd4a82bbad..84a14e4e0195d2eea5cd5efe2310de40f9b48abe 100644 (file)
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "NETIS WF-2881";
 
        memory@0 {
@@ -17,39 +16,6 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       nand@1e003000 {
-               status = "okay";
-
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x1000>;
-                       read-only;
-               };
-
-               partition@80000 {
-                       label = "config";
-                       reg = <0x80000 0x80000>;
-                       read-only;
-               };
-
-               factory: partition@100000 {
-                       label = "factory";
-                       reg = <0x100000 0x40000>;
-                       read-only;
-               };
-
-               partition@140000 {
-                       label = "firmware";
-                       reg = <0x140000 0x7E40000>;
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
 
@@ -78,8 +44,37 @@
        };
 };
 
-&spi0 {
-       status="disabled";
+&nand {
+       status = "okay";
+
+       partition@0 {
+               label = "u-boot";
+               reg = <0x0 0x30000>;
+               read-only;
+       };
+
+       partition@30000 {
+               label = "u-boot-env";
+               reg = <0x30000 0x1000>;
+               read-only;
+       };
+
+       partition@80000 {
+               label = "config";
+               reg = <0x80000 0x80000>;
+               read-only;
+       };
+
+       factory: partition@100000 {
+               label = "factory";
+               reg = <0x100000 0x40000>;
+               read-only;
+       };
+
+       partition@140000 {
+               label = "firmware";
+               reg = <0x140000 0x7E40000>;
+       };
 };
 
 &pcie {

diff --git a/target/linux/ramips/dts/WITI.dts b/target/linux/ramips/dts/WITI.dts
index a82a49521ba99d61195722fa8f250b02565fcfd4..de0c517d0ce63513a824bcf467b68266594009cb 100644 (file)
--- a/target/linux/ramips/dts/WITI.dts
+++ b/target/linux/ramips/dts/WITI.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "MQmaker WiTi";
 
        memory@0 {
@@ -43,15 +42,10 @@
        };
 };
 
-
 &sdhci {
        status = "okay";
 };
 
-&xhci {
-       status = "okay";
-};
-
 &spi0 {
        status = "okay";
 
@@ -60,8 +54,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/WNDR3700V5.dts b/target/linux/ramips/dts/WNDR3700V5.dts
index f67c32030e5cc867828bb9be4ad561741dd41621..b9ca6135a3de4ce74cd5be07a77c67f0630ac042 100644 (file)
--- a/target/linux/ramips/dts/WNDR3700V5.dts
+++ b/target/linux/ramips/dts/WNDR3700V5.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board","ralink,mt7621-soc";
        model = "Netgear WNDR3700v5";
 
        memory@0 {
@@ -71,13 +70,13 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       mx25l12805d@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "mx25l12805d";
+               compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80", "w25q128";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/WSR-1166.dts b/target/linux/ramips/dts/WSR-1166.dts
index 97a4304a7393f75d520c235c2a26a43cd9e975a5..ab6a9a4e3f5a753e86ab705b538bbd69b868fe9c 100644 (file)
--- a/target/linux/ramips/dts/WSR-1166.dts
+++ b/target/linux/ramips/dts/WSR-1166.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
        model = "Buffalo WSR-1166DHP";
 
        memory@0 {
@@ -121,8 +120,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";
@@ -184,3 +183,7 @@
                };
        };
 };
+
+&xhci {
+       status = "disabled";
+};

diff --git a/target/linux/ramips/dts/WSR-600.dts b/target/linux/ramips/dts/WSR-600.dts
index 43f63f6fadd306276c155d971dff3aaff86026a2..d5439fa4c1ffba48f398e78111f4d09bc61b516b 100644 (file)
--- a/target/linux/ramips/dts/WSR-600.dts
+++ b/target/linux/ramips/dts/WSR-600.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
        model = "Buffalo WSR-600DHP";
 
        memory@0 {
@@ -121,8 +120,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";
@@ -157,3 +156,7 @@
                };
        };
 };
+
+&xhci {
+       status = "disabled";
+};

diff --git a/target/linux/ramips/dts/ZBT-WG2626.dts b/target/linux/ramips/dts/ZBT-WG2626.dts
index e926514f7b2a3ab5c43aa00c4651b3bef0a04220..a75ca89aa891f8ac1d7f505b389dd76f97163b24 100644 (file)
--- a/target/linux/ramips/dts/ZBT-WG2626.dts
+++ b/target/linux/ramips/dts/ZBT-WG2626.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
        model = "ZBT-WG2626";
 
        memory@0 {
@@ -58,8 +57,8 @@
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
-               linux,modalias = "m25p80";
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/ZBT-WG3526.dtsi b/target/linux/ramips/dts/ZBT-WG3526.dtsi
index 1a4b9d6d21996861dce38c90daa7bdca83d86543..e48ef3a25b039b5f2c39b52783ba23cec186adbf 100644 (file)
--- a/target/linux/ramips/dts/ZBT-WG3526.dtsi
+++ b/target/linux/ramips/dts/ZBT-WG3526.dtsi
@@ -54,6 +54,7 @@
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
+               m25p,chunked-io = <32>;
 
                partition@0 {
                        label = "u-boot";

diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index a8b98ed8c610e3f065397f418f95c4c52b9c64a6..6b95c54befaee1bfee85b631ac5f2ddba7225394 100644 (file)
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -3,7 +3,7 @@
 / {
        #address-cells = <1>;
        #size-cells = <1>;
-       compatible = "mediatek,mtk7621-soc";
+       compatible = "mediatek,mt7621-soc";
 
        cpus {
                cpu@0 {
@@ -160,7 +160,7 @@
                };
 
                spi0: spi@b00 {
-                       status = "okay";
+                       status = "disabled";
 
                        compatible = "ralink,mt7621-spi";
                        reg = <0xb00 0x100>;
@@ -175,14 +175,6 @@
 
                        pinctrl-names = "default";
                        pinctrl-0 = <&spi_pins>;
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               reg = <0>;
-                               spi-max-frequency = <10000000>;
-                               m25p,chunked-io = <32>;
-                       };
                };
 
                gdma: gdma@2800 {
@@ -322,6 +314,8 @@
        };
 
        sdhci: sdhci@1E130000 {
+               status = "disabled";
+
                compatible = "ralink,mt7620-sdhci";
                reg = <0x1E130000 0x4000>;
 
@@ -427,7 +421,7 @@
                                GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH
                                GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
 
-               status = "okay";
+               status = "disabled";
 
                resets = <&rstctrl 24 &rstctrl 25 &rstctrl 26>;
                reset-names = "pcie0", "pcie1", "pcie2";