powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible

Starting with commit <8947e396a829> ("Documentation: dt: mtd:
replace "nor-jedec" binding with "jedec, spi-nor"") we have
"jedec,spi-nor" binding indicating support for JEDEC identification.

Use it for all flashes that are supposed to support READ ID op
according to the datasheets.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
Signed-off-by: Scott Wood <oss@buserror.net>

diff --git a/arch/powerpc/boot/dts/fsl/b4qds.dtsi b/arch/powerpc/boot/dts/fsl/b4qds.dtsi
index e8417947a0ee349e1ab319a4fe24fa78575a3f79..3785ef826d0734a4cac3c3774d6a07c6ff8f951f 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/b4qds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4qds.dtsi
@@ -142,7 +142,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "sst,sst25wf040";
+                               compatible = "sst,sst25wf040", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
                        };

diff --git a/arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi b/arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
index f4d96d277ed5b2b1492bab0db07bca33d33a30db..53f8b956340f43ab02bacad7523c97161ddab3d5 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
@@ -53,7 +53,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <50000000>;
 

diff --git a/arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi b/arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
index 7a13bf2aa439e608b12bb3b70c6f11c7c85bc10d..fead484a8180f7f8496fbb648419fa95f1d40e92 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
@@ -55,7 +55,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <30000000>;
                };

diff --git a/arch/powerpc/boot/dts/fsl/c293pcie.dts b/arch/powerpc/boot/dts/fsl/c293pcie.dts
index 53ab4db9e79cb2d354fe8e07aa76671498b86204..66709788429da7a103f0e41ae122fbdf21a6cfdf 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/c293pcie.dts
+++ b/arch/powerpc/boot/dts/fsl/c293pcie.dts
@@ -167,7 +167,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <50000000>;
 

diff --git a/arch/powerpc/boot/dts/fsl/kmcoge4.dts b/arch/powerpc/boot/dts/fsl/kmcoge4.dts
index 6858ec9ef2958c0ec4ac1820cffa16875a02a8ef..2d4b64fcee884a462fbc9ea66b4a5d73932bd683 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/kmcoge4.dts
+++ b/arch/powerpc/boot/dts/fsl/kmcoge4.dts
@@ -63,7 +63,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25fl256s1";
+                               compatible = "spansion,s25fl256s1", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <20000000>; /* input clock */
                        };
@@ -77,7 +77,7 @@
                        flash@2 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "micron,m25p32";
+                               compatible = "micron,m25p32", "jedec,spi-nor";
                                reg = <2>;
                                spi-max-frequency = <15000000>;
                        };

diff --git a/arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi b/arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi
index 937ad7e461196087a21da1f476b0b97c322e139e..a925fe49a73ec7eb1027e4e1bfbcab029f081169 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi
@@ -142,7 +142,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>;
                        partition@u-boot {
@@ -166,17 +166,17 @@
                        };
                };
                flash@1 {
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <1>;
                        spi-max-frequency = <40000000>;
                };
                flash@2 {
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <2>;
                        spi-max-frequency = <40000000>;
                };
                flash@3 {
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <3>;
                        spi-max-frequency = <40000000>;
                };

diff --git a/arch/powerpc/boot/dts/fsl/mvme2500.dts b/arch/powerpc/boot/dts/fsl/mvme2500.dts
index c7bc1a0c7194068d4e97ea847328297236f0814c..69559e970e998034cc30f4b639c3378b57763960 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mvme2500.dts
+++ b/arch/powerpc/boot/dts/fsl/mvme2500.dts
@@ -70,12 +70,12 @@
                        fsl,espi-num-chipselects = <2>;
 
                        flash@0 {
-                               compatible = "atmel,at25df641";
+                               compatible = "atmel,at25df641", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <10000000>;
                        };
                        flash@1 {
-                               compatible = "atmel,at25df641";
+                               compatible = "atmel,at25df641", "jedec,spi-nor";
                                reg = <1>;
                                spi-max-frequency = <10000000>;
                        };

diff --git a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
index 14b62950503893dc323913be9870188c12e2115f..a8e4ba070104ebba852e7c52a4dab34c22c0202e 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
@@ -110,7 +110,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>;
 

diff --git a/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi b/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
index c952cd37cf6dd3775dda54dad9401518455cc0cb..25f81eea60e09251a60e824131c48a34f90d2e55 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
@@ -151,7 +151,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>; /* input clock */
 

diff --git a/arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts b/arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
index 740553c090a374ca059476eaf89a91b24ded5966..f2dc6c09be522d3dd1cf26bff3f964e15254cb43 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
+++ b/arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
@@ -155,7 +155,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25sl12801";
+                               compatible = "spansion,s25sl12801", "jedec,spi-nor";
                                reg = <0>;
                                /* input clock */
                                spi-max-frequency = <40000000>;

diff --git a/arch/powerpc/boot/dts/fsl/p1020rdb.dtsi b/arch/powerpc/boot/dts/fsl/p1020rdb.dtsi
index 1fb7e0e0940f0cb098843b78207c6117efeffab7..703142ee66279d992a231f643e09c1eb37daa37f 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1020rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1020rdb.dtsi
@@ -148,7 +148,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>; /* input clock */
 

diff --git a/arch/powerpc/boot/dts/fsl/p1021mds.dts b/arch/powerpc/boot/dts/fsl/p1021mds.dts
index 27fdfd7dc7c73fc8d3d17ea002e822b32fdbe659..291454c75ddad117d1d4345d992116bff7cd3cfb 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1021mds.dts
+++ b/arch/powerpc/boot/dts/fsl/p1021mds.dts
@@ -123,7 +123,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25sl12801";
+                               compatible = "spansion,s25sl12801", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
 

diff --git a/arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi b/arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
index e8a0f95fb24a5648f79ccfa2535e38f2bd40a5b1..18f9b31602d0b7a53f381d29810110d28e15cc7a 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
@@ -150,7 +150,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>; /* input clock */
 

diff --git a/arch/powerpc/boot/dts/fsl/p1022ds.dtsi b/arch/powerpc/boot/dts/fsl/p1022ds.dtsi
index 149da0f123eeb9ebff4ea9b9bb1cd37e8cb85bff..ddefbf64f7f8b8c5efe6a05f27df2a3b7e873171 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1022ds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022ds.dtsi
@@ -160,7 +160,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>; /* input clock */
 

diff --git a/arch/powerpc/boot/dts/fsl/p1022rdk.dts b/arch/powerpc/boot/dts/fsl/p1022rdk.dts
index 04c16337268a7e2a4c23092581d46047cc101b1c..d505d7c51903b5879723c5b093f6e752635e2d7c 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1022rdk.dts
+++ b/arch/powerpc/boot/dts/fsl/p1022rdk.dts
@@ -86,7 +86,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,m25p80";
+                               compatible = "spansion,m25p80", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <1000000>;
                                partition@0 {

diff --git a/arch/powerpc/boot/dts/fsl/p1024rdb.dtsi b/arch/powerpc/boot/dts/fsl/p1024rdb.dtsi
index b05dcb40f800225c41be95c4f594886fa59768ad..b4d05867f707c6193784a32ce46f696451d23a29 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1024rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1024rdb.dtsi
@@ -129,7 +129,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,m25p80";
+                       compatible = "spansion,m25p80", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>;
 

diff --git a/arch/powerpc/boot/dts/fsl/p1025rdb.dtsi b/arch/powerpc/boot/dts/fsl/p1025rdb.dtsi
index f50256482297101c4fcda8c1093eadad638447ac..d44bb12debb01052e6d75ceaa60182c849f2101c 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1025rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1025rdb.dtsi
@@ -137,7 +137,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,s25sl12801";
+                       compatible = "spansion,s25sl12801", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>; /* input clock */
 

diff --git a/arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi b/arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
index ad2e242365ccada6e32800a381da45540a7cffac..03c9afc82436cd496b6d38612d4a9b810051e9a3 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
@@ -151,7 +151,7 @@
                flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       compatible = "spansion,m25p80";
+                       compatible = "spansion,m25p80", "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <40000000>;
 

diff --git a/arch/powerpc/boot/dts/fsl/p2020rdb.dts b/arch/powerpc/boot/dts/fsl/p2020rdb.dts
index 70cf09019ce5486b34a38a0afdacb65750db3c0e..435a319958cb11fbf64f25f8ba952b0827755f85 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p2020rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/p2020rdb.dts
@@ -155,7 +155,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25sl12801";
+                               compatible = "spansion,s25sl12801", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>;
 

diff --git a/arch/powerpc/boot/dts/fsl/p2041rdb.dts b/arch/powerpc/boot/dts/fsl/p2041rdb.dts
index fba3427de1dfe1fc76fcd61d3a5d0e12bee5656d..e50fea95a853cb18239cce36c6edcec1276ee6b1 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p2041rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/p2041rdb.dts
@@ -96,7 +96,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25sl12801";
+                               compatible = "spansion,s25sl12801", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
                                partition@u-boot {

diff --git a/arch/powerpc/boot/dts/fsl/p3041ds.dts b/arch/powerpc/boot/dts/fsl/p3041ds.dts
index cb319960e0a7743a1605e7dd95080b5a68657970..40748e415adbab4c448a4ef8cffa70f260d7d599 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p3041ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p3041ds.dts
@@ -97,7 +97,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25sl12801";
+                               compatible = "spansion,s25sl12801", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <35000000>; /* input clock */
                                partition@u-boot {

diff --git a/arch/powerpc/boot/dts/fsl/p4080ds.dts b/arch/powerpc/boot/dts/fsl/p4080ds.dts
index 733f4f1a00a7cfcfaa35b0a927c5e40ebbd75df0..816b9788d5f675858cda98d25517d04181a3efe9 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p4080ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p4080ds.dts
@@ -98,7 +98,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25sl12801";
+                               compatible = "spansion,s25sl12801", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
                                partition@u-boot {

diff --git a/arch/powerpc/boot/dts/fsl/p5020ds.dts b/arch/powerpc/boot/dts/fsl/p5020ds.dts
index ea424eab54e0c73ac4eb8c9688d41b2dc8774bc2..cd6f37386111a434955a398bbf848db7b727845d 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p5020ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p5020ds.dts
@@ -97,7 +97,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25sl12801";
+                               compatible = "spansion,s25sl12801", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
                                partition@u-boot {

diff --git a/arch/powerpc/boot/dts/fsl/p5040ds.dts b/arch/powerpc/boot/dts/fsl/p5040ds.dts
index 4f32adef02dcae364b780864c0b4450425500f5c..45084738cf4e5978d202b6a49606f1b7ce1d7a37 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p5040ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p5040ds.dts
@@ -109,7 +109,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25sl12801";
+                               compatible = "spansion,s25sl12801", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
                                partition@u-boot {

diff --git a/arch/powerpc/boot/dts/fsl/t1023rdb.dts b/arch/powerpc/boot/dts/fsl/t1023rdb.dts
index 9ac0eebb3c3ef1a560cbf0f4406aa952b638b234..29757623e5bafe8e29b47244275dbce25ff444a0 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t1023rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1023rdb.dts
@@ -79,7 +79,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "spansion,s25fl512s";
+                               compatible = "spansion,s25fl512s", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <10000000>; /* input clk */
                        };

diff --git a/arch/powerpc/boot/dts/fsl/t1024qds.dts b/arch/powerpc/boot/dts/fsl/t1024qds.dts
index 6a3581b8e1f85e235b995ed831aa08861a5081e1..772143da367ff0c0fb20c7fa1eb8b02cdeed6b61 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t1024qds.dts
+++ b/arch/powerpc/boot/dts/fsl/t1024qds.dts
@@ -87,7 +87,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "micron,n25q128a11";  /* 16MB */
+                               compatible = "micron,n25q128a11", "jedec,spi-nor";  /* 16MB */
                                reg = <0>;
                                spi-max-frequency = <10000000>;
                        };
@@ -95,7 +95,7 @@
                        flash@1 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "sst,sst25wf040";  /* 512KB */
+                               compatible = "sst,sst25wf040", "jedec,spi-nor";  /* 512KB */
                                reg = <1>;
                                spi-max-frequency = <10000000>;
                        };
@@ -103,7 +103,7 @@
                        flash@2 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "eon,en25s64";   /* 8MB */
+                               compatible = "eon,en25s64", "jedec,spi-nor";   /* 8MB */
                                reg = <2>;
                                spi-max-frequency = <10000000>;
                        };

diff --git a/arch/powerpc/boot/dts/fsl/t1024rdb.dts b/arch/powerpc/boot/dts/fsl/t1024rdb.dts
index 13c2190c26258e98b89f4192edbf38d222aa39ac..302cdd22b4bbbeba487190c6433fddcce91899c8 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t1024rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1024rdb.dts
@@ -89,7 +89,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "micron,n25q512ax3";
+                               compatible = "micron,n25q512ax3", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <10000000>; /* input clk */
                        };

diff --git a/arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi b/arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
index 3f6d7c6a106b7d18fe52afe6cc3cbb6dbf450fc9..8c7ea6c05de93e38508976405c936d0cc2f10fbe 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
@@ -104,7 +104,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "micron,n25q512ax3";
+                               compatible = "micron,n25q512ax3", "jedec,spi-nor";
                                reg = <0>;
                                /* input clock */
                                spi-max-frequency = <10000000>;

diff --git a/arch/powerpc/boot/dts/fsl/t104xqds.dtsi b/arch/powerpc/boot/dts/fsl/t104xqds.dtsi
index a02715b85ee805a2d956e22ebf032002a209b6e1..977af355b388104be13fe26b1f9b899772e72daa 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t104xqds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t104xqds.dtsi
@@ -261,7 +261,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "micron,n25q128a11";
+                               compatible = "micron,n25q128a11", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <10000000>; /* input clock */
                        };

diff --git a/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi b/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
index 8001c6fdddd89c9019d712033cddcd57dbcd8ad5..72691ef102ee75141d45bb6fee300127b4cf2e74 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
@@ -109,7 +109,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "micron,n25q512a";
+                               compatible = "micron,n25q512a", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <10000000>; /* input clock */
                        };

diff --git a/arch/powerpc/boot/dts/fsl/t208xqds.dtsi b/arch/powerpc/boot/dts/fsl/t208xqds.dtsi
index 869f9159b4d14ff9ed775c41f8dd2f17b8df0259..ec080bd01b0979b55f932c8d107c0d26212ace1b 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t208xqds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t208xqds.dtsi
@@ -112,7 +112,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "micron,n25q128a11"; /* 16MB */
+                               compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
                        };
@@ -120,7 +120,7 @@
                        flash@1 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "sst,sst25wf040";
+                               compatible = "sst,sst25wf040", "jedec,spi-nor";
                                reg = <1>;
                                spi-max-frequency = <35000000>;
                        };
@@ -128,7 +128,7 @@
                        flash@2 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "eon,en25s64";
+                               compatible = "eon,en25s64", "jedec,spi-nor";
                                reg = <2>;
                                spi-max-frequency = <35000000>;
                        };

diff --git a/arch/powerpc/boot/dts/fsl/t208xrdb.dtsi b/arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
index 693d2a8fa01cde3b78e2717af34bca06a737fa72..dc9326875778c19fb2dd75f56744a2ae2f43db0f 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
@@ -113,7 +113,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "micron,n25q512a";
+                               compatible = "micron,n25q512a", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <10000000>; /* input clock */
                        };

diff --git a/arch/powerpc/boot/dts/fsl/t4240qds.dts b/arch/powerpc/boot/dts/fsl/t4240qds.dts
index 22aecd738b045cb946b18219610fc6cf35aac4d1..9573ceada07c2c79f394ee2c7275bb12b6e51a44 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t4240qds.dts
+++ b/arch/powerpc/boot/dts/fsl/t4240qds.dts
@@ -358,7 +358,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "sst,sst25wf040";
+                               compatible = "sst,sst25wf040", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
                        };

diff --git a/arch/powerpc/boot/dts/fsl/t4240rdb.dts b/arch/powerpc/boot/dts/fsl/t4240rdb.dts
index 3d600347e1b1054c988d57b620e48a82f2a15e35..cc0a264b8acb3bb234d2a4e73ed5477d2d55c948 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t4240rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t4240rdb.dts
@@ -118,7 +118,7 @@
                        flash@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               compatible = "sst,sst25wf040";
+                               compatible = "sst,sst25wf040", "jedec,spi-nor";
                                reg = <0>;
                                spi-max-frequency = <40000000>; /* input clock */
                        };