dts: switch spi-flash to jedec, spi-nor compatible

There is no reason not to use the Linux "jedec,spi-nor" binding in U-Boot
dts files. This compatible has been added in sf_probe, let use it.

This patch switches to jedec,spi-nor when spi-flash is used in the DTS
and DTSI files, and removed spi-flash when jedec,spi-nor is already
present.

The x86 dts are switched in a separate commit since it depends on a change
in fdtdec.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Reviewed-by: Evgeniy Paltsev <paltsev@synopsys.com>
Reviewed-by: Rick Chen <rick@andestech.com>
Reviewed-by: Patrick Delaunay <Patrick.delaunay@st.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>

diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi
index dfc03810ca0d75e46f9ca0849a25a61183cc3503..b5aacd5170e18c31f2b80c37350e6453e43bf79e 100644 (file)
--- a/arch/arc/dts/axs10x_mb.dtsi
+++ b/arch/arc/dts/axs10x_mb.dtsi
@@ -71,7 +71,7 @@
                        clock-names = "spi_clk";
                        cs-gpio = <&cs_gpio 0>;
                        spi_flash@0 {
-                               compatible = "spi-flash";
+                               compatible = "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <4000000>;
                        };

diff --git a/arch/arc/dts/hsdk.dts b/arch/arc/dts/hsdk.dts
index f024b96925e440c956674833ab954f9fe6688554..5e9ba054a4cc4e24419aa03aea60c7ec2e1d612b 100644 (file)
--- a/arch/arc/dts/hsdk.dts
+++ b/arch/arc/dts/hsdk.dts
@@ -96,7 +96,7 @@
                clock-names = "spi_clk";
                cs-gpio = <&cs_gpio 0>;
                spi_flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <4000000>;
                };

diff --git a/arch/arm/dts/am335x-brppt1-spi.dts b/arch/arm/dts/am335x-brppt1-spi.dts
index 522ed5090208614c1634b7995a89fcb45efca488..01ab74be5edb1bb5b0669bd4631c9928a654134c 100644 (file)
--- a/arch/arm/dts/am335x-brppt1-spi.dts
+++ b/arch/arm/dts/am335x-brppt1-spi.dts
@@ -169,7 +169,7 @@
        spi_flash: spiflash@0 {
                u-boot,dm-spl;
                u-boot,dm-pre-reloc;
-               compatible = "spidev", "spi-flash";
+               compatible = "spidev", "jedec,spi-nor";
                spi-max-frequency = <24000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/am437x-idk-evm.dts b/arch/arm/dts/am437x-idk-evm.dts
index 28e3e1ba32a8de33ba8ca10f3f9e8f5b2a8e68fd..19d1462d15839be3ac8c41b6a5a44d4fed316662 100644 (file)
--- a/arch/arm/dts/am437x-idk-evm.dts
+++ b/arch/arm/dts/am437x-idk-evm.dts
@@ -339,7 +339,7 @@
 
        spi-max-frequency = <48000000>;
        m25p80@0 {
-               compatible = "mx66l51235l", "spi-flash";
+               compatible = "mx66l51235l", "jedec,spi-nor";
                spi-max-frequency = <48000000>;
                reg = <0>;
                spi-cpol;

diff --git a/arch/arm/dts/am437x-sk-evm.dts b/arch/arm/dts/am437x-sk-evm.dts
index 927d8d3e882a8dcfdc36c62c35de86b3a150bb56..dc8fcde4586f10dc8dbf970846bae06837074c14 100644 (file)
--- a/arch/arm/dts/am437x-sk-evm.dts
+++ b/arch/arm/dts/am437x-sk-evm.dts
@@ -568,7 +568,7 @@
 
        spi-max-frequency = <48000000>;
        m25p80@0 {
-               compatible = "mx66l51235l","spi-flash";
+               compatible = "mx66l51235l","jedec,spi-nor";
                spi-max-frequency = <48000000>;
                reg = <0>;
                spi-cpol;

diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts
index 770c08aa7dd4178fc814cb3cf0264f6bf3843e46..1b219c423bd796ac24794542f3d325eeadb35178 100644 (file)
--- a/arch/arm/dts/armada-3720-db.dts
+++ b/arch/arm/dts/armada-3720-db.dts
@@ -131,7 +131,7 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "st,m25p128", "spi-flash";
+               compatible = "st,m25p128", "jedec,spi-nor";
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <50000000>;
                m25p,fast-read;

diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts
index 7bfccb0435afe359b0221481383b0dee5566e3bd..84e2c2adbae442907d5042f5037770a4ba5a7978 100644 (file)
--- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts
@@ -118,7 +118,7 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "st,m25p128", "spi-flash";
+               compatible = "st,m25p128", "jedec,spi-nor";
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <50000000>;
                m25p,fast-read;

diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts
index 14bec0977e9ab2ec555d88dd3a586b21bc6b80cb..c36a5b8895ade550281ff3f4df5b539ada661285 100644 (file)
--- a/arch/arm/dts/armada-3720-turris-mox.dts
+++ b/arch/arm/dts/armada-3720-turris-mox.dts
@@ -115,7 +115,7 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "st,s25fl064l", "spi-flash";
+               compatible = "st,s25fl064l", "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <20000000>;
                m25p,fast-read;

diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-amc.dts
index c9ccbb57fff516a202b0bd49f9a961283d75a73d..d292851c689ffc6e7ef520e07deccd37cde9e479 100644 (file)
--- a/arch/arm/dts/armada-385-amc.dts
+++ b/arch/arm/dts/armada-385-amc.dts
@@ -154,7 +154,7 @@
                u-boot,dm-pre-reloc;
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "st,m25p128", "jedec,spi-nor", "spi-flash";
+               compatible = "st,m25p128", "jedec,spi-nor";
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <50000000>;
                m25p,fast-read;

diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
index 904429b9742989aaecbbf870285d931ed9dc0ba0..1b46797583d673b9d155fc77b76487965047a53e 100644 (file)
--- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
+++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
@@ -42,7 +42,7 @@
        u-boot,dm-pre-reloc;
 
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <40000000>;
                u-boot,dm-pre-reloc;

diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts
index bad7c60f19c49b9190f7808a1c76b41b467b5c27..5063a798df76b39bedbad380915befcbe254690c 100644 (file)
--- a/arch/arm/dts/armada-38x-controlcenterdc.dts
+++ b/arch/arm/dts/armada-38x-controlcenterdc.dts
@@ -573,14 +573,14 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q016a", "spi-flash";
+               compatible = "n25q016a", "jedec,spi-nor";
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <108000000>;
        };
        spi-flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q128a11", "spi-flash";
+               compatible = "n25q128a11", "jedec,spi-nor";
                reg = <1>; /* Chip select 1 */
                spi-max-frequency = <108000000>;
                u-boot,dm-pre-reloc;

diff --git a/arch/arm/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
index 74f58de85c4388b6fd9b9997e1b72ef187f00805..a2627223ce3b83dd1b6f7c2788912de31a369c91 100644 (file)
--- a/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
+++ b/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
@@ -86,7 +86,7 @@
        w25q32: spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "w25q32", "jedec,spi-nor", "spi-flash";
+               compatible = "w25q32", "jedec,spi-nor";
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <3000000>;
                status = "disabled";

diff --git a/arch/arm/dts/armada-8040-clearfog-gt-8k.dts b/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
index cdff44aca5aff6cf493f93cfb814dfaac83c6b4f..720c95082b6bde0acdb943c7844169af45ba4150 100644 (file)
--- a/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm/dts/armada-8040-clearfog-gt-8k.dts
@@ -240,7 +240,7 @@
        status = "okay";
 
        spi-flash@0 {
-               compatible = "jedec,spi-nor", "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
 

diff --git a/arch/arm/dts/armada-xp-theadorable.dts b/arch/arm/dts/armada-xp-theadorable.dts
index 5695e9b758569234dd4dcb6ffeb7e0af39583f65..b0f6c2bafe5a89a2bf3b7386c40a480320ab6faa 100644 (file)
--- a/arch/arm/dts/armada-xp-theadorable.dts
+++ b/arch/arm/dts/armada-xp-theadorable.dts
@@ -134,7 +134,7 @@
                                        u-boot,dm-pre-reloc;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
-                                       compatible = "n25q128a13", "jedec,spi-nor", "spi-flash";
+                                       compatible = "n25q128a13", "jedec,spi-nor";
                                        reg = <0>; /* Chip select 0 */
                                        spi-max-frequency = <27777777>;
                                };

diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts
index 33064b390a65dc593284f161501d6e0d3fe4acfa..c0708feeb7b23696c95cdc75437a9aaa3254d97d 100644 (file)
--- a/arch/arm/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/dts/at91-sama5d2_xplained.dts
@@ -110,7 +110,7 @@
                                u-boot,dm-pre-reloc;
 
                                spi_flash@0 {
-                                       compatible = "spi-flash";
+                                       compatible = "jedec,spi-nor";
                                        reg = <0>;
                                        spi-max-frequency = <50000000>;
                                        u-boot,dm-pre-reloc;

diff --git a/arch/arm/dts/at91-sama5d4_xplained.dts b/arch/arm/dts/at91-sama5d4_xplained.dts
index 58a0e60d184dd67edd884c7e03852e9559af4a65..7da5086865b84cb5bbbc1c1f422b00852cf029db 100644 (file)
--- a/arch/arm/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/dts/at91-sama5d4_xplained.dts
@@ -117,7 +117,7 @@
                                status = "okay";
                                spi_flash@0 {
                                        u-boot,dm-pre-reloc;
-                                       compatible = "spi-flash";
+                                       compatible = "jedec,spi-nor";
                                        spi-max-frequency = <50000000>;
                                        reg = <0>;
                                };

diff --git a/arch/arm/dts/at91-sama5d4ek.dts b/arch/arm/dts/at91-sama5d4ek.dts
index a5d75452cf3e8fff1c845e672cf1009f3c27f3a4..c1d657814df861aab21f6d15ef480c6f0b751191 100644 (file)
--- a/arch/arm/dts/at91-sama5d4ek.dts
+++ b/arch/arm/dts/at91-sama5d4ek.dts
@@ -137,7 +137,7 @@
                                status = "okay";
                                spi_flash@0 {
                                        u-boot,dm-pre-reloc;
-                                       compatible = "spi-flash";
+                                       compatible = "jedec,spi-nor";
                                        spi-max-frequency = <50000000>;
                                        reg = <0>;
                                };

diff --git a/arch/arm/dts/at91sam9n12ek.dts b/arch/arm/dts/at91sam9n12ek.dts
index 888bda15aaed690bf43aeed2c9251a4ca8eb2a3d..64a7abf639ffeb81f5a1cfab2bc59c9b983ec58b 100644 (file)
--- a/arch/arm/dts/at91sam9n12ek.dts
+++ b/arch/arm/dts/at91sam9n12ek.dts
@@ -112,7 +112,7 @@
                                status = "okay";
                                cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
                                spi_flash@0 {
-                                       compatible = "spi-flash";
+                                       compatible = "jedec,spi-nor";
                                        spi-max-frequency = <50000000>;
                                        reg = <0>;
                                };

diff --git a/arch/arm/dts/at91sam9x5ek.dtsi b/arch/arm/dts/at91sam9x5ek.dtsi
index f2a532d605da61fcc13e82c8e69dccdce092e74d..1f7f37b687c23ca96e468340ff0ae68a7eeeffa5 100644 (file)
--- a/arch/arm/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/dts/at91sam9x5ek.dtsi
@@ -121,7 +121,7 @@
                                status = "okay";
                                cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
                                spi_flash@0 {
-                                       compatible = "spi-flash";
+                                       compatible = "jedec,spi-nor";
                                        spi-max-frequency = <50000000>;
                                        reg = <0>;
                                };

diff --git a/arch/arm/dts/bk4r1.dts b/arch/arm/dts/bk4r1.dts
index 866b80e0b0b33a7ffa40b3f65d7a093665550cd1..16c60268fbae3431e1dd6ee87303d872ba3109d5 100644 (file)
--- a/arch/arm/dts/bk4r1.dts
+++ b/arch/arm/dts/bk4r1.dts
@@ -32,7 +32,7 @@
        qflash0: spi_flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <108000000>;
                reg = <0>;
        };
@@ -40,7 +40,7 @@
        qflash1: spi_flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <66000000>;
                reg = <1>;
        };

diff --git a/arch/arm/dts/da850-evm-u-boot.dtsi b/arch/arm/dts/da850-evm-u-boot.dtsi
index ab1de77954035d98fed19f6dbf03a45b2ba04934..360e79e68d41d94e776d00791028ce8f401ad76e 100644 (file)
--- a/arch/arm/dts/da850-evm-u-boot.dtsi
+++ b/arch/arm/dts/da850-evm-u-boot.dtsi
@@ -7,5 +7,5 @@
  */
 
 &flash {
-       compatible = "m25p64", "spi-flash";
+       compatible = "m25p64", "jedec,spi-nor";
 };

diff --git a/arch/arm/dts/exynos5250-snow.dts b/arch/arm/dts/exynos5250-snow.dts
index 7587dc0ff24dd5c1cc2a75c5a07dad4c134d3388..e41f2d3041e2f1a40358212a92f66e5a75ec99a2 100644 (file)
--- a/arch/arm/dts/exynos5250-snow.dts
+++ b/arch/arm/dts/exynos5250-snow.dts
@@ -232,7 +232,7 @@
        spi@12d30000 {
                spi-max-frequency = <50000000>;
                firmware_storage_spi: flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        reg = <0>;
                };
        };

diff --git a/arch/arm/dts/exynos5250-spring.dts b/arch/arm/dts/exynos5250-spring.dts
index c7553208adeed6f85255f9c412c0ced2427f7d34..77e7a6b9e45a61554c2996efe2e37d04d7bb014f 100644 (file)
--- a/arch/arm/dts/exynos5250-spring.dts
+++ b/arch/arm/dts/exynos5250-spring.dts
@@ -149,7 +149,7 @@
        spi@12d30000 {
                spi-max-frequency = <50000000>;
                firmware_storage_spi: flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        reg = <0>;
                };
        };

diff --git a/arch/arm/dts/exynos5420-peach-pit.dts b/arch/arm/dts/exynos5420-peach-pit.dts
index 4a96a18110a2fe85085ad9745bc14c267ca60a75..a68c3b517460f6483ba6984efd423290caaf7fed 100644 (file)
--- a/arch/arm/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/dts/exynos5420-peach-pit.dts
@@ -257,7 +257,7 @@
        spi@12d30000 { /* spi1 */
                spi-max-frequency = <50000000>;
                firmware_storage_spi: flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        reg = <0>;
 
                        /*

diff --git a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
index cdd4ce45aaf9bf15101cb8d27c49db26f90d6857..fecef88e08094a5e247f54a7b439ea37b588f0c4 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
+++ b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
@@ -27,7 +27,7 @@
        qflash0: s25fl128s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls1012a-frdm.dtsi b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
index 9cb3de1d40cf02105304ee6ea8cf541e58b0b79c..a357793bfaca5180aa22bddeccd32776c71f465a 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-frdm.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
@@ -21,7 +21,7 @@
        qflash0: s25fl128s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls1012a-frwy.dts b/arch/arm/dts/fsl-ls1012a-frwy.dts
index a56909ab92f4085e69c5828d5df8819a71cb54aa..7242af51e432e0f01fc9b6d2ecad407a54bcebc7 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-frwy.dts
+++ b/arch/arm/dts/fsl-ls1012a-frwy.dts
@@ -28,7 +28,7 @@
        qflash0: w25q16dw@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls1012a-qds.dtsi b/arch/arm/dts/fsl-ls1012a-qds.dtsi
index 661af0e49e637b51a722a2d78f8770545e48c65a..a330597b6c047ed3969fd7d7cf64dabd66583fbd 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-qds.dtsi
@@ -20,7 +20,7 @@
        dflash0: n25q128a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <1000000>; /* input clock */
        };
@@ -28,7 +28,7 @@
        dflash1: sst25wf040b {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3500000>;
                reg = <1>;
        };
@@ -36,7 +36,7 @@
        dflash2: en25s64 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3500000>;
                reg = <2>;
        };
@@ -49,7 +49,7 @@
        qflash0: s25fl128s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
index 757e2eb3519193090f65b68e42724dec77f3eb0a..f053e789c253b792fc8b1217e432ad270e79e8bf 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-rdb.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
@@ -21,7 +21,7 @@
        qflash0: s25fl128s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi
index 3841aee11e47347d097c595dd9c49b4e859db3b5..70e1a6a53f1130cd18f6eab0f4b1ac7d7359626f 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi
@@ -24,7 +24,7 @@
        dflash0: n25q128a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <1000000>; /* input clock */
                spi-cpol;
                spi-cpha;
@@ -34,7 +34,7 @@
        dflash1: sst25wf040b {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3500000>;
                spi-cpol;
                spi-cpha;
@@ -44,7 +44,7 @@
        dflash2: en25s64 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3500000>;
                spi-cpol;
                spi-cpha;
@@ -59,7 +59,7 @@
        qflash0: s25fl128s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls1043a-rdb.dts b/arch/arm/dts/fsl-ls1043a-rdb.dts
index c42cad703484e62736b9d5220021c45910f6b303..721b158169db43cf42b23bfea044a173d21621cd 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1043a-rdb.dts
@@ -26,7 +26,7 @@
        dspiflash: n25q12a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <1000000>; /* input clock */
        };

diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
index ada8a859b10a9cd4ef8a8cc781c42e351d67e7f2..c95f44fc36166b9f847c5919191d842f28dc4a2f 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
@@ -24,7 +24,7 @@
        dflash0: n25q128a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <1000000>; /* input clock */
                spi-cpol;
                spi-cpha;
@@ -34,7 +34,7 @@
        dflash1: sst25wf040b {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3500000>;
                spi-cpol;
                spi-cpha;
@@ -44,7 +44,7 @@
        dflash2: en25s64 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3500000>;
                spi-cpol;
                spi-cpha;
@@ -59,7 +59,7 @@
        qflash0: s25fl128s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index ba30fd262ac9477af0483d89695c1ed2bc2ae2b5..a05c9e9b9ea0ee33e4f89a7445514037c92ad261 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -26,7 +26,7 @@
        qflash0: s25fs512s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;
        };
@@ -34,7 +34,7 @@
        qflash1: s25fs512s@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <1>;
         };

diff --git a/arch/arm/dts/fsl-ls1088a-qds.dts b/arch/arm/dts/fsl-ls1088a-qds.dts
index 4ea451c1b6a9dd5271196cdfbc85918b1d4cdb70..8fbb52f0e09df5d827f40610f4031e1f38789073 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a-qds.dts
+++ b/arch/arm/dts/fsl-ls1088a-qds.dts
@@ -62,7 +62,7 @@
        dflash0: n25q128a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <1000000>; /* input clock */
        };
@@ -70,7 +70,7 @@
        dflash1: sst25wf040b {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3500000>;
                reg = <1>;
        };
@@ -78,7 +78,7 @@
        dflash2: en25s64 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3500000>;
                reg = <2>;
        };
@@ -91,7 +91,7 @@
        qflash0: s25fs512s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;
        };
@@ -99,7 +99,7 @@
        qflash1: s25fs512s@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <1>;
         };

diff --git a/arch/arm/dts/fsl-ls1088a-rdb.dts b/arch/arm/dts/fsl-ls1088a-rdb.dts
index f30bbb7247c503698fa1a3a84b05357eaeccf3cf..765d1e3d74e8c1bd5d66bfb95c41587ed7e2f86c 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1088a-rdb.dts
@@ -24,7 +24,7 @@
        qflash0: s25fs512s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;
        };
@@ -32,7 +32,7 @@
        qflash1: s25fs512s@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <1>;
         };

diff --git a/arch/arm/dts/fsl-ls2080a-qds.dts b/arch/arm/dts/fsl-ls2080a-qds.dts
index 39fbc1b79c1cc8a23724f547a78d05dc629bfed7..2a0a5280d07e81c9f535950ac5baa3fcb1b0da2b 100644 (file)
--- a/arch/arm/dts/fsl-ls2080a-qds.dts
+++ b/arch/arm/dts/fsl-ls2080a-qds.dts
@@ -26,7 +26,7 @@
        dflash0: n25q128a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3000000>;
                spi-cpol;
                spi-cpha;
@@ -35,7 +35,7 @@
        dflash1: sst25wf040b {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3000000>;
                spi-cpol;
                spi-cpha;
@@ -44,7 +44,7 @@
        dflash2: en25s64 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3000000>;
                spi-cpol;
                spi-cpha;
@@ -59,7 +59,7 @@
        qflash0: s25fs256s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls2080a-rdb.dts b/arch/arm/dts/fsl-ls2080a-rdb.dts
index e7567cfa2312d33db6373860e91684ddbd530711..0a87caeba967bd8436ac0a5e76fc6979e73d4b50 100644 (file)
--- a/arch/arm/dts/fsl-ls2080a-rdb.dts
+++ b/arch/arm/dts/fsl-ls2080a-rdb.dts
@@ -25,7 +25,7 @@
        dflash0: n25q512a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3000000>;
                spi-cpol;
                spi-cpha;

diff --git a/arch/arm/dts/fsl-ls2081a-rdb.dts b/arch/arm/dts/fsl-ls2081a-rdb.dts
index 73e2683d59bca7b4c151af6893697087ff57fd39..b0b7ef08a021823728f9b6f420a6afef4993854b 100644 (file)
--- a/arch/arm/dts/fsl-ls2081a-rdb.dts
+++ b/arch/arm/dts/fsl-ls2081a-rdb.dts
@@ -28,7 +28,7 @@
        dflash0: n25q512a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3000000>;
                spi-cpol;
                spi-cpha;
@@ -43,7 +43,7 @@
        qflash0: s25fs512s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;
        };
@@ -51,7 +51,7 @@
        qflash1: s25fs512s@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <1>;
        };

diff --git a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
index b6d4f0f6af1218f1172ae565f0cf77369dc16f9f..bf97d138fc2c7d5ba1c4aa9e1827e3f3c979ef4d 100644 (file)
--- a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
+++ b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
@@ -28,7 +28,7 @@
        dflash0: n25q512a {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <3000000>;
                spi-cpol;
                spi-cpha;
@@ -43,7 +43,7 @@
        qflash0: s25fs512s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;
        };
@@ -51,7 +51,7 @@
        qflash1: s25fs512s@1 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <1>;
        };

diff --git a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
index f5c68d707c376ba037c1f4ea8cc49b1508e22ef9..549461df71e4e083bb00df5186cafa61244f14f2 100644 (file)
--- a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
+++ b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
@@ -7,10 +7,10 @@
        num-cs = <2>;
 
        flash0: n25q256a@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
        };
 
        flash1: n25q256a@1 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
        };
 };

diff --git a/arch/arm/dts/imx6sx-sdb-u-boot.dtsi b/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
index 8e592cded9fbdc0237758f5dda57a9755aef3736..8f9236da0f3b4f186b05a4f4af09c18ceb235355 100644 (file)
--- a/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx6sx-sdb-u-boot.dtsi
@@ -7,10 +7,10 @@
        num-cs = <2>;
 
        flash0: n25q256a@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
        };
 
        flash1: n25q256a@1 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
        };
 };

diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
index db640d6e67420def7f3722e56ea1b8a25a06b408..77cb461a2157f7c21cacbbe990183e7199eccd3a 100644 (file)
--- a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
@@ -5,6 +5,6 @@
 
 &qspi {
        flash0: n25q256a@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
        };
 };
\ No newline at end of file

diff --git a/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
index db640d6e67420def7f3722e56ea1b8a25a06b408..77cb461a2157f7c21cacbbe990183e7199eccd3a 100644 (file)
--- a/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
@@ -5,6 +5,6 @@
 
 &qspi {
        flash0: n25q256a@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
        };
 };
\ No newline at end of file

diff --git a/arch/arm/dts/imx6ull-14x14-evk.dts b/arch/arm/dts/imx6ull-14x14-evk.dts
index 8a1b67d6bbf441b9b154a525d849477e4f1f7c3e..9ebcfe1f4ea1b6c9e7bb237a4a573b09fb51bf9b 100644 (file)
--- a/arch/arm/dts/imx6ull-14x14-evk.dts
+++ b/arch/arm/dts/imx6ull-14x14-evk.dts
@@ -455,7 +455,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                /* compatible = "micron,n25q256a"; */
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <29000000>;
                spi-nor,ddr-quad-read-dummy = <6>;
                reg = <0>;

diff --git a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
index 2ce6961096f4694644a79eda2caee0c045fc3cf5..585af6d211fe7bb477e77b397c818c323cc99f65 100644 (file)
--- a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
@@ -5,6 +5,6 @@
 
 &qspi1 {
        flash0: mx25l51245g@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
        };
 };

diff --git a/arch/arm/dts/keystone-k2e-evm.dts b/arch/arm/dts/keystone-k2e-evm.dts
index 3be8b532525cdb5ef65359c6ea0a53482e9ab4f1..9288df21ce1f386443e5347382a58d7917f8ea7d 100644 (file)
--- a/arch/arm/dts/keystone-k2e-evm.dts
+++ b/arch/arm/dts/keystone-k2e-evm.dts
@@ -123,7 +123,7 @@
        nor_flash: n25q128a11@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "Micron,n25q128a11", "spi-flash";
+               compatible = "Micron,n25q128a11", "jedec,spi-nor";
                spi-max-frequency = <54000000>;
                m25p,fast-read;
                reg = <0>;

diff --git a/arch/arm/dts/keystone-k2g-evm.dts b/arch/arm/dts/keystone-k2g-evm.dts
index 6c9de25b9447499e1060ba5b90e941e30fd3f52f..d91869f2c2b65775b3766ae208f426fd50ab48d3 100644 (file)
--- a/arch/arm/dts/keystone-k2g-evm.dts
+++ b/arch/arm/dts/keystone-k2g-evm.dts
@@ -75,7 +75,7 @@
        spi_nor: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                m25p,fast-read;
                reg = <0>;
@@ -97,7 +97,7 @@
        status = "okay";
 
        flash0: m25p80@0 {
-               compatible = "s25fl512s","spi-flash";
+               compatible = "s25fl512s","jedec,spi-nor";
                reg = <0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;

diff --git a/arch/arm/dts/keystone-k2g-ice.dts b/arch/arm/dts/keystone-k2g-ice.dts
index 698338b93d27b343fe5efd2a6661eb6e05a958e5..680dfee0713ca76fbd04054eb984fcfe72051ed9 100644 (file)
--- a/arch/arm/dts/keystone-k2g-ice.dts
+++ b/arch/arm/dts/keystone-k2g-ice.dts
@@ -38,7 +38,7 @@
        status = "okay";
 
        flash0: m25p80@0 {
-               compatible = "s25fl256s1", "spi-flash";
+               compatible = "s25fl256s1", "jedec,spi-nor";
                reg = <0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;

diff --git a/arch/arm/dts/keystone-k2hk-evm.dts b/arch/arm/dts/keystone-k2hk-evm.dts
index 76a675f1e4600feecc9c426c88241f0ca90a60c3..84c58d75ada9842ad701c390897597f894483f7b 100644 (file)
--- a/arch/arm/dts/keystone-k2hk-evm.dts
+++ b/arch/arm/dts/keystone-k2hk-evm.dts
@@ -151,7 +151,7 @@
        nor_flash: n25q128a11@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "Micron,n25q128a11", "spi-flash";
+               compatible = "Micron,n25q128a11", "jedec,spi-nor";
                spi-max-frequency = <54000000>;
                m25p,fast-read;
                reg = <0>;

diff --git a/arch/arm/dts/keystone-k2l-evm.dts b/arch/arm/dts/keystone-k2l-evm.dts
index b5c56176bf6046ab80e214fd42e94ac263c8d42e..91cefdf2aa9d54f6747cfb265d526296de84fa00 100644 (file)
--- a/arch/arm/dts/keystone-k2l-evm.dts
+++ b/arch/arm/dts/keystone-k2l-evm.dts
@@ -100,7 +100,7 @@
        nor_flash: n25q128a11@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "Micron,n25q128a11", "spi-flash";
+               compatible = "Micron,n25q128a11", "jedec,spi-nor";
                spi-max-frequency = <54000000>;
                m25p,fast-read;
                reg = <0>;

diff --git a/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts b/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
index e5b1efa1415a85de6519b7b2aff97018f6659317..4ae74f4316e58b52019cb00a2d395863658962c9 100644 (file)
--- a/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
+++ b/arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
@@ -78,7 +78,7 @@
        flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "st,m25p128", "jedec,spi-nor", "spi-flash";
+               compatible = "st,m25p128", "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <50000000>;
                mode = <0>;

diff --git a/arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts b/arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
index c234449936232b713ea0f50bd2ca5f31b18c5aee..6e3418f24611b4d86ab5ecce2c108aa63ef200ef 100644 (file)
--- a/arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
+++ b/arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
@@ -92,7 +92,7 @@
        flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "st,m25p128", "jedec,spi-nor", "spi-flash";
+               compatible = "st,m25p128", "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <50000000>;
                mode = <0>;

diff --git a/arch/arm/dts/kirkwood-dreamplug.dts b/arch/arm/dts/kirkwood-dreamplug.dts
index ccd74dd7fb33cb65a6e4402a952cc883c8b4a245..e9eea22fc93ba8ffce7a8d595e8d264345496f76 100644 (file)
--- a/arch/arm/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/dts/kirkwood-dreamplug.dts
@@ -47,7 +47,7 @@
                        m25p40@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "mxicy,mx25l1606e", "jedec,spi-nor", "spi-flash";
+                               compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <50000000>;
                                mode = <0>;

diff --git a/arch/arm/dts/kirkwood-lsxl.dtsi b/arch/arm/dts/kirkwood-lsxl.dtsi
index 479a750d1d816104f006acba2b099b1d1dd1118e..c99c0da0937b5725a3c5ad5a0183539b8ebb88d2 100644 (file)
--- a/arch/arm/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/dts/kirkwood-lsxl.dtsi
@@ -79,7 +79,7 @@
                        m25p40@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "m25p40", "jedec,spi-nor", "spi-flash";
+                               compatible = "m25p40", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <25000000>;
                                mode = <0>;

diff --git a/arch/arm/dts/kirkwood-netxbig.dtsi b/arch/arm/dts/kirkwood-netxbig.dtsi
index 135ac8021c8c339a4183e9228997af6a0c90c30b..b5737026e244dafe25bef6692381c2980b8666d5 100644 (file)
--- a/arch/arm/dts/kirkwood-netxbig.dtsi
+++ b/arch/arm/dts/kirkwood-netxbig.dtsi
@@ -32,7 +32,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "mxicy,mx25l4005a", "jedec,spi-nor", "spi-flash";
+                               compatible = "mxicy,mx25l4005a", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <20000000>;
                                mode = <0>;

diff --git a/arch/arm/dts/kirkwood-ns2-common.dtsi b/arch/arm/dts/kirkwood-ns2-common.dtsi
index f997bb4df202b6f922e6f57d02cfebbd0c03108c..51530ea86622af05fc09eaa993e52c6dd9918aad 100644 (file)
--- a/arch/arm/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/dts/kirkwood-ns2-common.dtsi
@@ -30,7 +30,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "mxicy,mx25l4005a", "jedec,spi-nor", "spi-flash";
+                               compatible = "mxicy,mx25l4005a", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <20000000>;
                                mode = <0>;

diff --git a/arch/arm/dts/kirkwood-synology.dtsi b/arch/arm/dts/kirkwood-synology.dtsi
index b80d8ee37093a4447afd88d7bfeac92eba6f0fbf..c97ed29a0a0bf3cb2aa01e37e15ca99d72c3301f 100644 (file)
--- a/arch/arm/dts/kirkwood-synology.dtsi
+++ b/arch/arm/dts/kirkwood-synology.dtsi
@@ -201,7 +201,7 @@
                        m25p80@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "st,m25p80", "jedec,spi-nor", "spi-flash";
+                               compatible = "st,m25p80", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <20000000>;
                                mode = <0>;

diff --git a/arch/arm/dts/ls1021a-iot.dtsi b/arch/arm/dts/ls1021a-iot.dtsi
index d27b6014207421171af10c4583dbfbe4a6d81c3c..44dd9b61d3f4c06aeffcd24bea0bda245f081e24 100644 (file)
--- a/arch/arm/dts/ls1021a-iot.dtsi
+++ b/arch/arm/dts/ls1021a-iot.dtsi
@@ -27,7 +27,7 @@
        qflash0: n25q128a13@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };
@@ -40,7 +40,7 @@
        dspiflash: at26df081a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <16000000>;
                spi-cpol;
                spi-cpha;

diff --git a/arch/arm/dts/ls1021a-qds.dtsi b/arch/arm/dts/ls1021a-qds.dtsi
index f7783e51653ba76ea888e9c2d6519b7e0b1c2b34..b12102abfa388b5c79dcfaa9432cdd7377b40f24 100644 (file)
--- a/arch/arm/dts/ls1021a-qds.dtsi
+++ b/arch/arm/dts/ls1021a-qds.dtsi
@@ -43,7 +43,7 @@
        qflash0: s25fl128s@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/ls1021a-twr.dtsi b/arch/arm/dts/ls1021a-twr.dtsi
index 928e1002585c637dd1c51ef12514c89b84fb8f55..5d3275ced913e1b49b4ae2b23c89c25bdcb414bc 100644 (file)
--- a/arch/arm/dts/ls1021a-twr.dtsi
+++ b/arch/arm/dts/ls1021a-twr.dtsi
@@ -30,7 +30,7 @@
        qflash0: n25q128a13@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;
        };
@@ -43,7 +43,7 @@
        dspiflash: at26df081a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <16000000>;
                spi-cpol;
                spi-cpha;

diff --git a/arch/arm/dts/mt7629-rfb.dts b/arch/arm/dts/mt7629-rfb.dts
index 95d10aa6d324fa37266f5e8c562d6ca2cd37e1ae..4612218a1ebf2b9ba236d1d04eae09badf1bdac8 100644 (file)
--- a/arch/arm/dts/mt7629-rfb.dts
+++ b/arch/arm/dts/mt7629-rfb.dts
@@ -62,7 +62,7 @@
        status = "okay";
 
        spi-flash@0{
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                u-boot,dm-pre-reloc;
        };

diff --git a/arch/arm/dts/omap5-u-boot.dtsi b/arch/arm/dts/omap5-u-boot.dtsi
index 54a7285e6e1ea04cba5e31b7cad24253316b2353..1b1d765fae0cb02cda81866872a46fcf49d6525c 100644 (file)
--- a/arch/arm/dts/omap5-u-boot.dtsi
+++ b/arch/arm/dts/omap5-u-boot.dtsi
@@ -68,7 +68,7 @@
        u-boot,dm-spl;
 
        m25p80@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                u-boot,dm-spl;
        };
 };

diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dts b/arch/arm/dts/r8a77970-eagle-u-boot.dts
index 5b17f1d1f0bb3000be06ff27ae2038010873ee38..eb868eda4147a31e157c35c0c438358759032754 100644 (file)
--- a/arch/arm/dts/r8a77970-eagle-u-boot.dts
+++ b/arch/arm/dts/r8a77970-eagle-u-boot.dts
@@ -44,7 +44,7 @@
        flash0: spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "s25fs512s", "spi-flash", "jedec,spi-nor";
+               compatible = "s25fs512s", "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <1>;

diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi
index 49ba3f3f1432c8345dc9f187960e67feb898910a..916dd486de094f95358d5eac76dc9ee6ad98769c 100644 (file)
--- a/arch/arm/dts/rk3288-veyron.dtsi
+++ b/arch/arm/dts/rk3288-veyron.dtsi
@@ -307,7 +307,7 @@
 
        spi_flash: spiflash@0 {
                u-boot,dm-pre-reloc;
-               compatible = "spidev", "spi-flash";
+               compatible = "spidev", "jedec,spi-nor";
                spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */
                reg = <0>;
        };

diff --git a/arch/arm/dts/rk3368-lion.dts b/arch/arm/dts/rk3368-lion.dts
index 5e578b175b5e7fb13eb4da8c67da3a7f32872eaf..28145420837a573c36746b770f1a112644ebe39c 100644 (file)
--- a/arch/arm/dts/rk3368-lion.dts
+++ b/arch/arm/dts/rk3368-lion.dts
@@ -185,7 +185,7 @@
        #size-cells = <0>;
 
        spiflash: w25q32dw@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <49500000>;
                spi-cpol;

diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
index df19263accb1790b9867b371b3da8bb3f8465eff..4cdb4320b76cb48a6e794ccc74475ee8e6be3b57 100644 (file)
--- a/arch/arm/dts/rk3399-gru.dtsi
+++ b/arch/arm/dts/rk3399-gru.dtsi
@@ -552,7 +552,7 @@ ap_i2c_audio: &i2c8 {
 
        spi_flash: spiflash@0 {
                u-boot,dm-pre-reloc;
-               compatible = "jedec,spi-nor", "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
 
                /* May run faster once verified. */

diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index 8304f67192cfdb5c9d8a04799c8be6e192c29881..aec13a28f1abc340ae9e035959fdc4fe99191e9b 100644 (file)
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -658,7 +658,7 @@
        spiflash: w25q32dw@0 {
                u-boot,dm-pre-reloc;
 
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <49500000>;
                spi-cpol;

diff --git a/arch/arm/dts/rv1108-evb.dts b/arch/arm/dts/rv1108-evb.dts
index ccb9969da0e324c43194e648b17f7bd77fe93e38..c91776bc106eb355f81f060de203f81bcde7eecf 100644 (file)
--- a/arch/arm/dts/rv1108-evb.dts
+++ b/arch/arm/dts/rv1108-evb.dts
@@ -45,7 +45,7 @@
 &sfc {
        status = "okay";
        flash@0 {
-               compatible = "gd25q256","spi-flash";
+               compatible = "gd25q256","jedec,spi-nor";
                reg = <0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <1>;

diff --git a/arch/arm/dts/sama5d27_som1.dtsi b/arch/arm/dts/sama5d27_som1.dtsi
index 9efcf635ad5100147b11488627ef68a788da70f6..ea7540bcfcf7278ba73167002a860051ddb4dc83 100644 (file)
--- a/arch/arm/dts/sama5d27_som1.dtsi
+++ b/arch/arm/dts/sama5d27_som1.dtsi
@@ -66,7 +66,7 @@
                                u-boot,dm-pre-reloc;
 
                                spi_flash@0 {
-                                       compatible = "spi-flash";
+                                       compatible = "jedec,spi-nor";
                                        reg = <0>;
                                        spi-max-frequency = <50000000>;
                                        spi-rx-bus-width = <4>;

diff --git a/arch/arm/dts/sama5d3xmb.dtsi b/arch/arm/dts/sama5d3xmb.dtsi
index f9ef905ff541952e075ab7f3546193dae7d03981..c75b76aef2a4da7c28544e5e6e55cf1dfcef5cb3 100644 (file)
--- a/arch/arm/dts/sama5d3xmb.dtsi
+++ b/arch/arm/dts/sama5d3xmb.dtsi
@@ -35,7 +35,7 @@
                                u-boot,dm-pre-reloc;
 
                                spi_flash@0 {
-                                       compatible = "spi-flash";
+                                       compatible = "jedec,spi-nor";
                                        spi-max-frequency = <50000000>;
                                        reg = <0>;
                                        u-boot,dm-pre-reloc;

diff --git a/arch/arm/dts/sama5d3xmb_cmp.dtsi b/arch/arm/dts/sama5d3xmb_cmp.dtsi
index 9792b2a9d08f74a7b1fa883f972ffcccca6c23e7..5566fde51489cc73a05a054d4c7c2593153bfb64 100644 (file)
--- a/arch/arm/dts/sama5d3xmb_cmp.dtsi
+++ b/arch/arm/dts/sama5d3xmb_cmp.dtsi
@@ -32,7 +32,7 @@
                                dmas = <0>, <0>;        /*  Do not use DMA for spi0 */
 
                                spi_flash@0 {
-                                       compatible = "spi-flash";
+                                       compatible = "jedec,spi-nor";
                                        spi-max-frequency = <50000000>;
                                        reg = <0>;
                                };

diff --git a/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
index c44d1ee2fa188b7262e70499865a7b5b4e2e63e7..e75f2902c54be3f4bfefba01f1d883ee30f526b3 100644 (file)
--- a/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
@@ -30,7 +30,7 @@
 };
 
 &flash {
-       compatible = "n25q00", "spi-flash";
+       compatible = "n25q00", "jedec,spi-nor";
        u-boot,dm-pre-reloc;
 };
 

diff --git a/arch/arm/dts/socfpga_cyclone5_is1.dts b/arch/arm/dts/socfpga_cyclone5_is1.dts
index b7054bfd5af514bc4ba0fc21b48757aa88cb7dab..93e4d45ad2b7edb0f67abc67ee92af56e81f9a37 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_is1.dts
+++ b/arch/arm/dts/socfpga_cyclone5_is1.dts
@@ -91,7 +91,7 @@
                u-boot,dm-pre-reloc;
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q00", "spi-flash";
+               compatible = "n25q00", "jedec,spi-nor";
                reg = <0>;      /* chip select */
                spi-max-frequency = <100000000>;
                m25p,fast-read;

diff --git a/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
index 9436e0fa8b1ba725821ea69aefa324d69ff93cf5..2fafd7e399d3eb86854b645144ff005fd4a3dce0 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
@@ -34,7 +34,7 @@
 };
 
 &flash0 {
-       compatible = "n25q00", "spi-flash";
+       compatible = "n25q00", "jedec,spi-nor";
        u-boot,dm-pre-reloc;
 
        partition@qspi-boot {

diff --git a/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi
index 648f1bd01d74fc7b177641529e1dcc08b23913d7..7ef30531f4a62687018e1de13d50694d41b8cd2b 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi
@@ -30,7 +30,7 @@
 };
 
 &flash {
-       compatible = "n25q00", "spi-flash";
+       compatible = "n25q00", "jedec,spi-nor";
        u-boot,dm-pre-reloc;
 };
 

diff --git a/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi
index 31bd1dba0ffcc39a5f695a6ccdb82dbb2b8fa9bb..1003115ceadb8bf3d0c7510ae1b4fce81238e1f8 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi
@@ -30,7 +30,7 @@
 };
 
 &flash {
-       compatible = "n25q256a", "spi-flash";
+       compatible = "n25q256a", "jedec,spi-nor";
        u-boot,dm-pre-reloc;
 };
 

diff --git a/arch/arm/dts/socfpga_cyclone5_sr1500.dts b/arch/arm/dts/socfpga_cyclone5_sr1500.dts
index 6a6c29be79be91a2235a702c741c45edb454b692..1a18c4f3baf6f913193dd5668189e78e2dc08875 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_sr1500.dts
+++ b/arch/arm/dts/socfpga_cyclone5_sr1500.dts
@@ -99,7 +99,7 @@
                u-boot,dm-pre-reloc;
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q00", "spi-flash";
+               compatible = "n25q00", "jedec,spi-nor";
                reg = <0>;      /* chip select */
                spi-max-frequency = <100000000>;
                m25p,fast-read;

diff --git a/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi
index 360b946ba2350f61d7a2fab045a7c1d66b68dd84..e05ca8279a9eef942e5542827cce5f723e9bea59 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi
@@ -29,11 +29,11 @@
        u-boot,dm-pre-reloc;
 
        n25q128@0 {
-               compatible = "n25q128", "spi-flash";
+               compatible = "n25q128", "jedec,spi-nor";
                u-boot,dm-pre-reloc;
        };
        n25q00@1 {
-               compatible = "n25q00", "spi-flash";
+               compatible = "n25q00", "jedec,spi-nor";
                u-boot,dm-pre-reloc;
        };
 };

diff --git a/arch/arm/dts/stm32f746-disco.dts b/arch/arm/dts/stm32f746-disco.dts
index 7ef33d6381304c495079af06656b2a93fff0602c..babd37f1c11b57c269e58e48ae70535eba6eb85d 100644 (file)
--- a/arch/arm/dts/stm32f746-disco.dts
+++ b/arch/arm/dts/stm32f746-disco.dts
@@ -297,7 +297,7 @@
        qflash0: n25q128a {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "micron,n25q128a13", "spi-flash";
+                       compatible = "micron,n25q128a13", "jedec,spi-nor";
                        spi-max-frequency = <108000000>;
                        spi-tx-bus-width = <1>;
                        spi-rx-bus-width = <1>;

diff --git a/arch/arm/dts/stm32f769-disco.dts b/arch/arm/dts/stm32f769-disco.dts
index 1e8ef742ceade6994ca5be12f20cdc35169dd983..a23d02d3008751570eb3026401c2efd4f8339360 100644 (file)
--- a/arch/arm/dts/stm32f769-disco.dts
+++ b/arch/arm/dts/stm32f769-disco.dts
@@ -246,7 +246,7 @@
        qflash0: n25q128a {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "micron,n25q128a13", "spi-flash";
+                       compatible = "micron,n25q128a13", "jedec,spi-nor";
                        spi-max-frequency = <108000000>;
                        spi-tx-bus-width = <1>;
                        spi-rx-bus-width = <1>;

diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
index 30b173478c6ca8a1243090b23f891b6edefd8e37..409f983fb2ea672c4fb542eb553ddc62a187fc02 100644 (file)
--- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
@@ -14,11 +14,11 @@
 };
 
 &flash0 {
-       compatible = "spi-flash";
+       compatible = "jedec,spi-nor";
 };
 
 &flash1 {
-       compatible = "spi-flash";
+       compatible = "jedec,spi-nor";
 };
 
 &v3v3 {

diff --git a/arch/arm/dts/stv0991.dts b/arch/arm/dts/stv0991.dts
index 98bd5dfc70f237942f2d8d1d7d5fccc58b2ea592..b04e89971c77b9d9abc080609bdad882554f8bea 100644 (file)
--- a/arch/arm/dts/stv0991.dts
+++ b/arch/arm/dts/stv0991.dts
@@ -40,7 +40,7 @@
                        flash0: n25q32@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spi-flash";
+                               compatible = "jedec,spi-nor";
                                reg = <0>;              /* chip select */
                                spi-max-frequency = <50000000>;
                                m25p,fast-read;

diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts
index d2b7fc2c994b1cc1526a2d9504c3a533bfdcdd9e..7a540b63f47135584710e0c7d0b51b8fde63cc5b 100644 (file)
--- a/arch/arm/dts/zynq-zed.dts
+++ b/arch/arm/dts/zynq-zed.dts
@@ -53,7 +53,7 @@
        status = "okay";
        num-cs = <1>;
        flash@0 {
-               compatible = "spansion,s25fl256s", "spi-flash";
+               compatible = "spansion,s25fl256s", "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <30000000>;
                m25p,fast-read;

diff --git a/arch/arm/dts/zynqmp-zc1232-revA.dts b/arch/arm/dts/zynqmp-zc1232-revA.dts
index 5c212ba468e6ba3141d22e244d60c1255d24c9fb..6117f83c474e89cf4cf74c615b00dcba1cb4591a 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1232-revA.dts
+++ b/arch/arm/dts/zynqmp-zc1232-revA.dts
@@ -41,7 +41,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* 32MB FIXME */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB FIXME */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zc1254-revA.dts b/arch/arm/dts/zynqmp-zc1254-revA.dts
index 881aacc582536b281d6bdff4c0fc41053ce1b6ae..6ac8346d23d913e4c66ff50a7928442176acaca9 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1254-revA.dts
+++ b/arch/arm/dts/zynqmp-zc1254-revA.dts
@@ -41,7 +41,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zc1275-revA.dts b/arch/arm/dts/zynqmp-zc1275-revA.dts
index 7403f153e44729bfcb0462b1b3236a4e7fef0889..82c30a3fbef0e66d1bddc28186f8d17fbbe2b52a 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1275-revA.dts
+++ b/arch/arm/dts/zynqmp-zc1275-revA.dts
@@ -41,7 +41,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zc1275-revB.dts b/arch/arm/dts/zynqmp-zc1275-revB.dts
index 1a7975b551d13c4f3a16e1e2750e4f0713383119..0473503afafd8360399cd4696a682424e9b1228f 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1275-revB.dts
+++ b/arch/arm/dts/zynqmp-zc1275-revB.dts
@@ -42,7 +42,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
index 9768dfe0446c45d68bd12db6ef1fff7e1ca6a4d0..8824f5cc02729535f31428176fe5a02d273e0396 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
@@ -101,7 +101,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* Micron MT25QU512ABB8ESF */
+               compatible = "m25p80", "jedec,spi-nor"; /* Micron MT25QU512ABB8ESF */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
index 9afbbb63b49b54a80045bcbc97caceb1999590d8..84c2904dc202a59e2fcdb47f367140fa3657e156 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
@@ -180,7 +180,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index 0e96a3618821f3da5174aec4d4177e3b20da9ae8..6e22871713139517ad5f7f1d2e659690233bd946 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -521,7 +521,7 @@
        status = "okay";
        is-dual = <1>;
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index 431dff52fe6434f9cd705639f8afa7846a2f982e..c7a3cdcf61df9fdbef05134766eddea8856b01c4 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -169,7 +169,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* n25q512a 128MiB */
+               compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index 623d2c96cda4f193777dcf67bfadb282d0862cfd..7df16b047ceb01b595313dee316bc194eb94db51 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -176,7 +176,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* n25q512a 128MiB */
+               compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 00f6e30ef34d17212126eb39b90dd9c4607c7812..9fd3953fb44bb1ff578128f7f518b0fc0cffbeb9 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -495,7 +495,7 @@
        status = "okay";
        is-dual = <1>;
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 58021be9bfda357c1060a7cec77f932c8087172d..2e28a3934fd307d39993d3aaf5a63a8e1f60c44b 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -432,7 +432,7 @@
        status = "okay";
        is-dual = <1>;
        flash@0 {
-               compatible = "m25p80", "spi-flash"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;

diff --git a/arch/mips/dts/ap121.dts b/arch/mips/dts/ap121.dts
index 4ca1c704ca4ecba38ccd4d76773dc3a7d01388ab..f30af502161c92842c2fd4152452da53cfa1737e 100644 (file)
--- a/arch/mips/dts/ap121.dts
+++ b/arch/mips/dts/ap121.dts
@@ -34,7 +34,7 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                memory-map = <0x9f000000 0x00800000>;
                spi-max-frequency = <25000000>;
                reg = <0>;

diff --git a/arch/mips/dts/ap143.dts b/arch/mips/dts/ap143.dts
index 6aedd87db9a85595f00f3c701f51c9094da2c1d3..82bf637410b05d550814b97174935a7c2d379a45 100644 (file)
--- a/arch/mips/dts/ap143.dts
+++ b/arch/mips/dts/ap143.dts
@@ -34,7 +34,7 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                memory-map = <0x9f000000 0x00800000>;
                spi-max-frequency = <25000000>;
                reg = <0>;

diff --git a/arch/mips/dts/comtrend,ar-5315u.dts b/arch/mips/dts/comtrend,ar-5315u.dts
index eb60aaa8d5f832f1ff2a094a68eed644f8f3e2d2..28443b3b0fd9fbc4481ba19b5768e6736d95761c 100644 (file)
--- a/arch/mips/dts/comtrend,ar-5315u.dts
+++ b/arch/mips/dts/comtrend,ar-5315u.dts
@@ -110,7 +110,7 @@
        status = "okay";
 
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/mips/dts/comtrend,ar-5387un.dts b/arch/mips/dts/comtrend,ar-5387un.dts
index 03e3851ab15b61e462e91823778baa8ddd5f9598..12ace64621bf2c0d89b78510af6e32afd2b96fd7 100644 (file)
--- a/arch/mips/dts/comtrend,ar-5387un.dts
+++ b/arch/mips/dts/comtrend,ar-5387un.dts
@@ -94,7 +94,7 @@
        status = "okay";
 
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/mips/dts/gardena-smart-gateway-mt7688.dts b/arch/mips/dts/gardena-smart-gateway-mt7688.dts
index 75f6037e96a8d4a55b4ef306e9be1f5c509408ba..2f2cfdd9f967f609ecf8ea7e71ad4e37222bf9b4 100644 (file)
--- a/arch/mips/dts/gardena-smart-gateway-mt7688.dts
+++ b/arch/mips/dts/gardena-smart-gateway-mt7688.dts
@@ -97,7 +97,7 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash", "jedec,spi-nor";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <40000000>;
                reg = <0>;
        };

diff --git a/arch/mips/dts/jr2_pcb110.dts b/arch/mips/dts/jr2_pcb110.dts
index ddc30ff76a9b89a775732498ac31a0a5b3bca976..1e123978e39c23252a447e9c1e9ad53b2df7e4b9 100644 (file)
--- a/arch/mips/dts/jr2_pcb110.dts
+++ b/arch/mips/dts/jr2_pcb110.dts
@@ -43,7 +43,7 @@
 &spi0 {
        status = "okay";
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
        };

diff --git a/arch/mips/dts/jr2_pcb111.dts b/arch/mips/dts/jr2_pcb111.dts
index 4d411b6dc4ea4df18e0c637232ae494e010ed19c..fcd8455407fa23a8b55da8584effbed2f7291773 100644 (file)
--- a/arch/mips/dts/jr2_pcb111.dts
+++ b/arch/mips/dts/jr2_pcb111.dts
@@ -43,7 +43,7 @@
 &spi0 {
        status = "okay";
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
        };

diff --git a/arch/mips/dts/linkit-smart-7688.dts b/arch/mips/dts/linkit-smart-7688.dts
index c9db136f30f6f2f340182e9d4c5a69b38c17dfa2..bb104021747a55a7c13aaa35f6e8a2eb3b7658db 100644 (file)
--- a/arch/mips/dts/linkit-smart-7688.dts
+++ b/arch/mips/dts/linkit-smart-7688.dts
@@ -38,7 +38,7 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash", "jedec,spi-nor";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <25000000>;
                reg = <0>;
        };

diff --git a/arch/mips/dts/luton_pcb090.dts b/arch/mips/dts/luton_pcb090.dts
index 315172b19c54a1274eb7f95a67dcb062093a018e..fe457bae9d56e6ab49b2b051d0cf8de85c5c59d8 100644 (file)
--- a/arch/mips/dts/luton_pcb090.dts
+++ b/arch/mips/dts/luton_pcb090.dts
@@ -48,7 +48,7 @@
 &spi0 {
        status = "okay";
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
                spi-cs-high;

diff --git a/arch/mips/dts/luton_pcb091.dts b/arch/mips/dts/luton_pcb091.dts
index 9b4d628797e4174eae2d9dd5db7a76e459abb473..f684cc8dd6332eb0c584030342ad04da1fdc932e 100644 (file)
--- a/arch/mips/dts/luton_pcb091.dts
+++ b/arch/mips/dts/luton_pcb091.dts
@@ -54,7 +54,7 @@
 &spi0 {
        status = "okay";
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
                spi-cs-high;

diff --git a/arch/mips/dts/mscc,ocelot_pcb.dtsi b/arch/mips/dts/mscc,ocelot_pcb.dtsi
index 90725d3b94143e65fdf336e5baeafa0bbc8c22c9..885b5643f7c9c7bb6469548324af8aa302da7537 100644 (file)
--- a/arch/mips/dts/mscc,ocelot_pcb.dtsi
+++ b/arch/mips/dts/mscc,ocelot_pcb.dtsi
@@ -29,7 +29,7 @@
        pinctrl-names = "default";
 
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
        };

diff --git a/arch/mips/dts/netgear,cg3100d.dts b/arch/mips/dts/netgear,cg3100d.dts
index a3d4cd56a23ff6d724e696a51198cc3bfe83bf7e..a42a0da2dd64e2646baef4351fc2167b62e5db0f 100644 (file)
--- a/arch/mips/dts/netgear,cg3100d.dts
+++ b/arch/mips/dts/netgear,cg3100d.dts
@@ -93,7 +93,7 @@
        status = "okay";
 
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/mips/dts/sagem,f@st1704.dts b/arch/mips/dts/sagem,f@st1704.dts
index ec6846dd9f2577a842b09e070f366690a7cbdff2..98ed353f2079b80edac3d0f47c695cbb797b71dc 100644 (file)
--- a/arch/mips/dts/sagem,f@st1704.dts
+++ b/arch/mips/dts/sagem,f@st1704.dts
@@ -59,7 +59,7 @@
        status = "okay";
 
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/mips/dts/serval2_pcb112.dts b/arch/mips/dts/serval2_pcb112.dts
index fe025f4c42a7185a23155348512785e477063c3d..2921c449dc9264ef47dabd0998f08c2c1fc1d94c 100644 (file)
--- a/arch/mips/dts/serval2_pcb112.dts
+++ b/arch/mips/dts/serval2_pcb112.dts
@@ -43,7 +43,7 @@
 &spi0 {
        status = "okay";
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
        };

diff --git a/arch/mips/dts/serval_pcb105.dts b/arch/mips/dts/serval_pcb105.dts
index d0d6facba2285964b7f751bf29a8c625e67703bc..1598669447fdd0a9cbe04674ac3fea3762122cdf 100644 (file)
--- a/arch/mips/dts/serval_pcb105.dts
+++ b/arch/mips/dts/serval_pcb105.dts
@@ -43,7 +43,7 @@
 &spi0 {
        status = "okay";
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
                spi-cs-high;

diff --git a/arch/mips/dts/serval_pcb106.dts b/arch/mips/dts/serval_pcb106.dts
index 11982498d71f542c01bd7d676e3de0934e495d92..fb3524bb31e0cab2aab8ea9a028ab34acc38bd04 100644 (file)
--- a/arch/mips/dts/serval_pcb106.dts
+++ b/arch/mips/dts/serval_pcb106.dts
@@ -43,7 +43,7 @@
 &spi0 {
        status = "okay";
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
                spi-cs-high;

diff --git a/arch/mips/dts/servalt_pcb116.dts b/arch/mips/dts/servalt_pcb116.dts
index fb3331204b3e80f52a507ea87088a2d3f9a964cf..4de3e25164fd82a3fd08f2bba7a3af0fb042e634 100644 (file)
--- a/arch/mips/dts/servalt_pcb116.dts
+++ b/arch/mips/dts/servalt_pcb116.dts
@@ -43,7 +43,7 @@
 &spi0 {
        status = "okay";
        spi-flash@0 {
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <18000000>; /* input clock */
                reg = <0>; /* CS0 */
                spi-cs-high;

diff --git a/arch/mips/dts/tplink_wdr4300.dts b/arch/mips/dts/tplink_wdr4300.dts
index 96cf0da5bfb3f778e3d017f8ca49f314ecfc9cdf..2bcad6d201be1f6ffc87a166f239998aa05d3294 100644 (file)
--- a/arch/mips/dts/tplink_wdr4300.dts
+++ b/arch/mips/dts/tplink_wdr4300.dts
@@ -35,7 +35,7 @@
        spi-flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                memory-map = <0x1e000000 0x00800000>;
                spi-max-frequency = <25000000>;
                reg = <0>;

diff --git a/arch/nds32/dts/ae3xx.dts b/arch/nds32/dts/ae3xx.dts
index 272eb3359abd45aed6597a79e685621248275be6..7bba2a2bf098d9ff6e8dc26ae6bd4d7c7767b64f 100644 (file)
--- a/arch/nds32/dts/ae3xx.dts
+++ b/arch/nds32/dts/ae3xx.dts
@@ -93,7 +93,7 @@
                clocks = <&spiclk>;
                interrupts = <3 4>;
                        flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        spi-max-frequency = <50000000>;
                        reg = <0>;
                        spi-cpol;

diff --git a/arch/riscv/dts/ae350_32.dts b/arch/riscv/dts/ae350_32.dts
index 2ec01a5ce795656efd3ef3001682e2bb2e6e3f9f..cb6ee13f16d0941ac79cc3e6dd420d321b849e82 100644 (file)
--- a/arch/riscv/dts/ae350_32.dts
+++ b/arch/riscv/dts/ae350_32.dts
@@ -256,7 +256,7 @@
                interrupts = <4 4>;
                interrupt-parent = <&plic0>;
                flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        spi-max-frequency = <50000000>;
                        reg = <0>;
                        spi-cpol;

diff --git a/arch/riscv/dts/ae350_64.dts b/arch/riscv/dts/ae350_64.dts
index cde5cdeff83ae793eb6ecaf011b3f16fe62f37af..705491a8e4d82da42b5c5852763cb30fc6790443 100644 (file)
--- a/arch/riscv/dts/ae350_64.dts
+++ b/arch/riscv/dts/ae350_64.dts
@@ -256,7 +256,7 @@
                interrupts = <4 4>;
                interrupt-parent = <&plic0>;
                flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        spi-max-frequency = <50000000>;
                        reg = <0>;
                        spi-cpol;

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 87d8e5bcc98b4ac8e4cd774d60250e39f4c6b04c..54c4c196abe47e06d46cc06d4bf277a3b462a93a 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -578,7 +578,7 @@
                cs-gpios = <0>, <&gpio_a 0>;
                spi.bin@0 {
                        reg = <0>;
-                       compatible = "spansion,m25p16", "spi-flash";
+                       compatible = "spansion,m25p16", "jedec,spi-nor";
                        spi-max-frequency = <40000000>;
                        sandbox,filename = "spi.bin";
                };