ARM: dts: marvell: align SPI NOR node name with dtschema

The node names should be generic and SPI NOR dtschema expects "flash".

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220407143234.295426-1-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 77261a2fb94996d904b307c39dddc6722a94cb97..a7dc4c04d10bdf19f7eab0e5b849e311b649074d 100644 (file)
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -203,7 +203,7 @@
        pinctrl-names = "default";
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "mx25l25635e", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index a624b2371fb6a7ad92ddd645243c43fffd96735b..0abac5ffe45aa420bac19f565c2a24616cb67bef 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -159,7 +159,7 @@
        pinctrl-0 = <&spi0_pins2>;
        pinctrl-names = "default";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                /* MX25L8006E */

diff --git a/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
index 64f2ce254fb6ccd40bd3e519205dbf3a901288eb..e72b8ed4b9973415077883b646977f894ba43b33 100644 (file)
--- a/arch/arm/boot/dts/armada-370-synology-ds213j.dts
+++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
@@ -258,7 +258,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q064", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index 0e679465cbb5dde0cdf57e4a401838d3d61c8b78..4c4092790a200fb7f038b518b61b37040d3f71b9 100644 (file)
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -64,7 +64,7 @@
 
        status = "disabled";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "n25q128a13", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-381-netgear-gs110emx.dts b/arch/arm/boot/dts/armada-381-netgear-gs110emx.dts
index 0a961116a1f9d07b5a01fd980b61b9e01b0773a1..396172067f6abfa1a38a6fa397cee9e092609393 100644 (file)
--- a/arch/arm/boot/dts/armada-381-netgear-gs110emx.dts
+++ b/arch/arm/boot/dts/armada-381-netgear-gs110emx.dts
@@ -242,7 +242,7 @@
        pinctrl-names = "default";
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-385-atl-x530.dts b/arch/arm/boot/dts/armada-385-atl-x530.dts
index ed3f41c7df7152d4c949a510fa3ae73af1de1dda..241f5d7c80e9a30e2286dff1281262f647239dad 100644 (file)
--- a/arch/arm/boot/dts/armada-385-atl-x530.dts
+++ b/arch/arm/boot/dts/armada-385-atl-x530.dts
@@ -168,7 +168,7 @@
        pinctrl-0 = <&spi1_pins>;
        status = "okay";
 
-       spi-flash@1 {
+       flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi b/arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi
index 624bbcae68c09dd944a48aaaceaeff17ce3291f7..10ad46f29393de6059507e0707e432993efbdfea 100644 (file)
--- a/arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi
+++ b/arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi
@@ -365,7 +365,7 @@
        pinctrl-names = "default";
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "w25q32", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts b/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
index 7881df3b28a07dbfce854fe0cfcfe284be1cfa8b..389d9c75d546a1ca86b980fe5101b315dabbe1a4 100644 (file)
--- a/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
+++ b/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
@@ -126,7 +126,7 @@
        pinctrl-0 = <&spi1_pins>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index 0e4613bb56eeae02d496be3784517760cf425537..332f8fce77dc27c0809ab6c53ccc2a21e4805344 100644 (file)
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -192,7 +192,7 @@
        pinctrl-0 = <&spi1_pins>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "st,m25p128", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-385-synology-ds116.dts b/arch/arm/boot/dts/armada-385-synology-ds116.dts
index d8769956cbfcff7b4a38e72959ba8b88f397a1c0..2622af73c9da6a6c214b0ace7bdb09908d5ba980 100644 (file)
--- a/arch/arm/boot/dts/armada-385-synology-ds116.dts
+++ b/arch/arm/boot/dts/armada-385-synology-ds116.dts
@@ -223,7 +223,7 @@
        pinctrl-0 = <&spi0_pins>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "macronix,mx25l6405d", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts
index f240018148f6f5251cdb74f035f45355be885109..c9ff3f8c5e582b236cbe8963c2e788e225322485 100644 (file)
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
@@ -485,7 +485,7 @@
        pinctrl-0 = <&spi0_pins &spi0cs0_pins>;
        status = "okay";
 
-       spi-nor@0 {
+       flash@0 {
                compatible = "spansion,s25fl164k", "jedec,spi-nor";
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts
index a2bec07bf4c55190707952545e911b932954b9cd..5130eccc32af6fba6536e1e1aa55bfe007302751 100644 (file)
--- a/arch/arm/boot/dts/armada-388-db.dts
+++ b/arch/arm/boot/dts/armada-388-db.dts
@@ -133,7 +133,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "w25q32", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts
index 9d873257ac4584087735670753ffe4e5d8ec60b1..e2ba50520b6b0ba89e209886e29ea5aa31ddbb83 100644 (file)
--- a/arch/arm/boot/dts/armada-388-gp.dts
+++ b/arch/arm/boot/dts/armada-388-gp.dts
@@ -395,7 +395,7 @@
        pinctrl-0 = <&spi0_pins>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "st,m25p128", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-388-rd.dts b/arch/arm/boot/dts/armada-388-rd.dts
index 328a4d6afd2cd988ee8b4d704aaf0192ef29bfdd..c0efafd45b338c56dad503b37d8e52c8a7ef3121 100644 (file)
--- a/arch/arm/boot/dts/armada-388-rd.dts
+++ b/arch/arm/boot/dts/armada-388-rd.dts
@@ -97,7 +97,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "st,m25p128", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
index 363ac42388594680d5a8bd8ee651069ba59f902a..2c64bc6e5a1704407b9456ce5a69dab890179f70 100644 (file)
--- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
+++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
@@ -101,7 +101,7 @@
        /* The microsom has an optional W25Q32 on board, connected to CS0 */
        pinctrl-0 = <&spi1_pins>;
 
-       w25q32: spi-flash@0 {
+       w25q32: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "w25q32", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-390-db.dts b/arch/arm/boot/dts/armada-390-db.dts
index 0e29474ae9a298b613fc65a9c85e6eca7f46dd00..792d0a0184e8268029da9d0833af5f14279f0289 100644 (file)
--- a/arch/arm/boot/dts/armada-390-db.dts
+++ b/arch/arm/boot/dts/armada-390-db.dts
@@ -81,7 +81,7 @@
        pinctrl-0 = <&spi1_pins>;
        pinctrl-names = "default";
 
-       spi-flash@1 {
+       flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "n25q128a13",

diff --git a/arch/arm/boot/dts/armada-398-db.dts b/arch/arm/boot/dts/armada-398-db.dts
index fc28308e5bc5db5f29e2f897304594e0b3a1be9b..ec6cdbeedde7196c5353e9e5f16073004c700294 100644 (file)
--- a/arch/arm/boot/dts/armada-398-db.dts
+++ b/arch/arm/boot/dts/armada-398-db.dts
@@ -79,7 +79,7 @@
        pinctrl-0 = <&spi1_pins>;
        pinctrl-names = "default";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "n25q128a13", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index 606fd3476a59c2995afd3f638f66f143aac95f9c..3e77b4337802c88fb567af0451cd9ac69c7fb5e2 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -134,7 +134,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "n25q128a13", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts b/arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
index a022c68dc943f83ebafcce10d3f837b1432f526d..c28e140b4afc86ca8cbea561ab5ad291a55eeab7 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
+++ b/arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
@@ -15,7 +15,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi b/arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi
index 32fb21b2bf6a27a2a7f3c880cb9d498098223162..47b003a81bd4bff5d66686002632ea6854a19453 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi
+++ b/arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi
@@ -80,7 +80,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts b/arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
index 21f442afab1fe1c03b2050469dbd24594d0b1855..20ba5c823bb27ed70a32711a67d4dbe36ca4a8ec 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
+++ b/arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
@@ -15,7 +15,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi b/arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi
index f3e1a25ca5f2dc8dc0ec26450ae8e45f02b9b966..cab99d8e291133388a511e32513669ccfe1a5e92 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi
+++ b/arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi
@@ -80,7 +80,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts b/arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
index e05aee6cdc04cf806e8f801413ec32f4aeaa47a8..2caa3980fdf669b940465c6d84350e47bff36829 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
+++ b/arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
@@ -15,7 +15,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi b/arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi
index c8b1355ce15ed6e96fe10e7cf70edd25fa930a09..7028482ce4b2dbf4ad9f125b373b385eacf9c41a 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi
+++ b/arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi
@@ -80,7 +80,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
index 8a3aa616bbd006f25d37446cc11323e6f235ef26..02bef8dc4270153cffb6b8b23b5b9b8d815af2e0 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
+++ b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
@@ -93,7 +93,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "m25p64";

diff --git a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
index 4ec0ae01b61d0158dc52487d671f93d8ea1f1d48..d1b61dad0c461e98dba32ccb4a3345d3f3463713 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
+++ b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
@@ -89,7 +89,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "m25p64";

diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 5d04dc68cf5795ef8e61533cbf0b0f8bb9dc0546..75318fd0fc11755ced7ba128d984234d67245ed9 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -235,7 +235,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "m25p64", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index b4cca507cf1361b6c534a68f1961b660ef0fece8..d1d348b91c0a82d308186df2539d708a58da7aa8 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -220,7 +220,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "n25q128a13", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index 8480a16919a0ed9c8123de9615c04573bac7c928..36932e3b781abe8ac0d171c2d2ba6b6cb25ba834 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -255,7 +255,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "everspin,mr25h256";

diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index 809e821d7399d84f4a784b5143269b897ce2013a..5551bac1962c2de2e0a866250541fdae893eb092 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -274,7 +274,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q064", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 3e1584e787aec8c59e02cf0d4e05a6d240dffc0a..2639b9fe0ab48532b17b0abd481d5cf0ea9b4870 100644 (file)
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -127,7 +127,7 @@
        status = "okay";
 
        /* spi0.0: 4M Flash Winbond W25Q32BV */
-       spi-flash@0 {
+       flash@0 {
                compatible = "st,w25q32";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/dove-d2plug.dts b/arch/arm/boot/dts/dove-d2plug.dts
index 273f12ca2512a3ded3833f107394c10d36b66436..a0e8996c2ffde7cb509992b4693bd342cbc2cc5a 100644 (file)
--- a/arch/arm/boot/dts/dove-d2plug.dts
+++ b/arch/arm/boot/dts/dove-d2plug.dts
@@ -62,7 +62,7 @@
        status = "okay";
 
        /* spi0.0: 4M Flash Macronix MX25L3205D */
-       spi-flash@0 {
+       flash@0 {
                compatible = "st,m25l3205d";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts
index 826026c28f909c93b7b31d7e7f70d126e0d90648..1e81d1b970550b67a66cf25a24477dee1b556467 100644 (file)
--- a/arch/arm/boot/dts/dove-d3plug.dts
+++ b/arch/arm/boot/dts/dove-d3plug.dts
@@ -79,7 +79,7 @@
        status = "okay";
 
        /* spi0.0: 2M Flash Macronix MX25L1605D */
-       spi-flash@0 {
+       flash@0 {
                compatible = "st,m25l1605d";
                spi-max-frequency = <86000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/dove-dove-db.dts b/arch/arm/boot/dts/dove-dove-db.dts
index 1754a62e014e2e1f83c78fcc161fd538c295e26a..c1912dc6bfc35ebd2ad459dff812008e08c3bd1f 100644 (file)
--- a/arch/arm/boot/dts/dove-dove-db.dts
+++ b/arch/arm/boot/dts/dove-dove-db.dts
@@ -27,7 +27,7 @@
        status = "okay";
 
        /* spi0.0: 4M Flash ST-M25P32-VMF6P */
-       spi-flash@0 {
+       flash@0 {
                compatible = "st,m25p32";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts
index b3ad3f607d313376dc74dbc3b8c50934cb8ed627..c32300611d2cd24378009abc87a718b18d3d7ac8 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dir665.dts
+++ b/arch/arm/boot/dts/kirkwood-dir665.dts
@@ -78,7 +78,7 @@
 
                spi@10600 {
                        status = "okay";
-                       m25p80@0 {
+                       flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
                                compatible = "mxicy,mx25l12805d", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index 217bd374e52be8fd5db96e51c08fe236d81d17fe..8f6c387d3a8b407e14967e1b2c80abd10b915d81 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -198,7 +198,7 @@
                spi@10600 {
                        status = "okay";
 
-                       m25p80@0 {
+                       flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
                                compatible = "st,m25p80", "jedec,spi-nor";