Browse Source

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>
Hou Zhiqiang 9 years ago
parent
commit
fba4e9f989
34 changed files with 43 additions and 43 deletions
  1. 1 1
      arch/powerpc/boot/dts/fsl/b4qds.dtsi
  2. 1 1
      arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
  3. 1 1
      arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
  4. 1 1
      arch/powerpc/boot/dts/fsl/c293pcie.dts
  5. 2 2
      arch/powerpc/boot/dts/fsl/kmcoge4.dts
  6. 4 4
      arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi
  7. 2 2
      arch/powerpc/boot/dts/fsl/mvme2500.dts
  8. 1 1
      arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
  9. 1 1
      arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
  10. 1 1
      arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
  11. 1 1
      arch/powerpc/boot/dts/fsl/p1020rdb.dtsi
  12. 1 1
      arch/powerpc/boot/dts/fsl/p1021mds.dts
  13. 1 1
      arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
  14. 1 1
      arch/powerpc/boot/dts/fsl/p1022ds.dtsi
  15. 1 1
      arch/powerpc/boot/dts/fsl/p1022rdk.dts
  16. 1 1
      arch/powerpc/boot/dts/fsl/p1024rdb.dtsi
  17. 1 1
      arch/powerpc/boot/dts/fsl/p1025rdb.dtsi
  18. 1 1
      arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
  19. 1 1
      arch/powerpc/boot/dts/fsl/p2020rdb.dts
  20. 1 1
      arch/powerpc/boot/dts/fsl/p2041rdb.dts
  21. 1 1
      arch/powerpc/boot/dts/fsl/p3041ds.dts
  22. 1 1
      arch/powerpc/boot/dts/fsl/p4080ds.dts
  23. 1 1
      arch/powerpc/boot/dts/fsl/p5020ds.dts
  24. 1 1
      arch/powerpc/boot/dts/fsl/p5040ds.dts
  25. 1 1
      arch/powerpc/boot/dts/fsl/t1023rdb.dts
  26. 3 3
      arch/powerpc/boot/dts/fsl/t1024qds.dts
  27. 1 1
      arch/powerpc/boot/dts/fsl/t1024rdb.dts
  28. 1 1
      arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
  29. 1 1
      arch/powerpc/boot/dts/fsl/t104xqds.dtsi
  30. 1 1
      arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
  31. 3 3
      arch/powerpc/boot/dts/fsl/t208xqds.dtsi
  32. 1 1
      arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
  33. 1 1
      arch/powerpc/boot/dts/fsl/t4240qds.dts
  34. 1 1
      arch/powerpc/boot/dts/fsl/t4240rdb.dts

+ 1 - 1
arch/powerpc/boot/dts/fsl/b4qds.dtsi

@@ -142,7 +142,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "sst,sst25wf040";
+				compatible = "sst,sst25wf040", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 			};
 			};

+ 1 - 1
arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi

@@ -53,7 +53,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <50000000>;
 			spi-max-frequency = <50000000>;
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi

@@ -55,7 +55,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <30000000>;
 			spi-max-frequency = <30000000>;
 		};
 		};

+ 1 - 1
arch/powerpc/boot/dts/fsl/c293pcie.dts

@@ -167,7 +167,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <50000000>;
 			spi-max-frequency = <50000000>;
 
 

+ 2 - 2
arch/powerpc/boot/dts/fsl/kmcoge4.dts

@@ -63,7 +63,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25fl256s1";
+				compatible = "spansion,s25fl256s1", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <20000000>; /* input clock */
 				spi-max-frequency = <20000000>; /* input clock */
 			};
 			};
@@ -77,7 +77,7 @@
 			flash@2 {
 			flash@2 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,m25p32";
+				compatible = "micron,m25p32", "jedec,spi-nor";
 				reg = <2>;
 				reg = <2>;
 				spi-max-frequency = <15000000>;
 				spi-max-frequency = <15000000>;
 			};
 			};

+ 4 - 4
arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi

@@ -142,7 +142,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>;
 			spi-max-frequency = <40000000>;
 			partition@u-boot {
 			partition@u-boot {
@@ -166,17 +166,17 @@
 			};
 			};
 		};
 		};
 		flash@1 {
 		flash@1 {
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <1>;
 			reg = <1>;
 			spi-max-frequency = <40000000>;
 			spi-max-frequency = <40000000>;
 		};
 		};
 		flash@2 {
 		flash@2 {
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <2>;
 			reg = <2>;
 			spi-max-frequency = <40000000>;
 			spi-max-frequency = <40000000>;
 		};
 		};
 		flash@3 {
 		flash@3 {
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <3>;
 			reg = <3>;
 			spi-max-frequency = <40000000>;
 			spi-max-frequency = <40000000>;
 		};
 		};

+ 2 - 2
arch/powerpc/boot/dts/fsl/mvme2500.dts

@@ -70,12 +70,12 @@
 			fsl,espi-num-chipselects = <2>;
 			fsl,espi-num-chipselects = <2>;
 
 
 			flash@0 {
 			flash@0 {
-				compatible = "atmel,at25df641";
+				compatible = "atmel,at25df641", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <10000000>;
 				spi-max-frequency = <10000000>;
 			};
 			};
 			flash@1 {
 			flash@1 {
-				compatible = "atmel,at25df641";
+				compatible = "atmel,at25df641", "jedec,spi-nor";
 				reg = <1>;
 				reg = <1>;
 				spi-max-frequency = <10000000>;
 				spi-max-frequency = <10000000>;
 			};
 			};

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1010rdb.dtsi

@@ -110,7 +110,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>;
 			spi-max-frequency = <40000000>;
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi

@@ -151,7 +151,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>; /* input clock */
 			spi-max-frequency = <40000000>; /* input clock */
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts

@@ -155,7 +155,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25sl12801";
+				compatible = "spansion,s25sl12801", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				/* input clock */
 				/* input clock */
 				spi-max-frequency = <40000000>;
 				spi-max-frequency = <40000000>;

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1020rdb.dtsi

@@ -148,7 +148,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>; /* input clock */
 			spi-max-frequency = <40000000>; /* input clock */
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1021mds.dts

@@ -123,7 +123,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25sl12801";
+				compatible = "spansion,s25sl12801", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi

@@ -150,7 +150,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>; /* input clock */
 			spi-max-frequency = <40000000>; /* input clock */
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1022ds.dtsi

@@ -160,7 +160,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>; /* input clock */
 			spi-max-frequency = <40000000>; /* input clock */
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1022rdk.dts

@@ -86,7 +86,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,m25p80";
+				compatible = "spansion,m25p80", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <1000000>;
 				spi-max-frequency = <1000000>;
 				partition@0 {
 				partition@0 {

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1024rdb.dtsi

@@ -129,7 +129,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,m25p80";
+			compatible = "spansion,m25p80", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>;
 			spi-max-frequency = <40000000>;
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p1025rdb.dtsi

@@ -137,7 +137,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,s25sl12801";
+			compatible = "spansion,s25sl12801", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>; /* input clock */
 			spi-max-frequency = <40000000>; /* input clock */
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi

@@ -151,7 +151,7 @@
 		flash@0 {
 		flash@0 {
 			#address-cells = <1>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			#size-cells = <1>;
-			compatible = "spansion,m25p80";
+			compatible = "spansion,m25p80", "jedec,spi-nor";
 			reg = <0>;
 			reg = <0>;
 			spi-max-frequency = <40000000>;
 			spi-max-frequency = <40000000>;
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p2020rdb.dts

@@ -155,7 +155,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25sl12801";
+				compatible = "spansion,s25sl12801", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>;
 				spi-max-frequency = <40000000>;
 
 

+ 1 - 1
arch/powerpc/boot/dts/fsl/p2041rdb.dts

@@ -96,7 +96,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25sl12801";
+				compatible = "spansion,s25sl12801", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 				partition@u-boot {
 				partition@u-boot {

+ 1 - 1
arch/powerpc/boot/dts/fsl/p3041ds.dts

@@ -97,7 +97,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25sl12801";
+				compatible = "spansion,s25sl12801", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <35000000>; /* input clock */
 				spi-max-frequency = <35000000>; /* input clock */
 				partition@u-boot {
 				partition@u-boot {

+ 1 - 1
arch/powerpc/boot/dts/fsl/p4080ds.dts

@@ -98,7 +98,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25sl12801";
+				compatible = "spansion,s25sl12801", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 				partition@u-boot {
 				partition@u-boot {

+ 1 - 1
arch/powerpc/boot/dts/fsl/p5020ds.dts

@@ -97,7 +97,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25sl12801";
+				compatible = "spansion,s25sl12801", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 				partition@u-boot {
 				partition@u-boot {

+ 1 - 1
arch/powerpc/boot/dts/fsl/p5040ds.dts

@@ -109,7 +109,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25sl12801";
+				compatible = "spansion,s25sl12801", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 				partition@u-boot {
 				partition@u-boot {

+ 1 - 1
arch/powerpc/boot/dts/fsl/t1023rdb.dts

@@ -79,7 +79,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "spansion,s25fl512s";
+				compatible = "spansion,s25fl512s", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <10000000>; /* input clk */
 				spi-max-frequency = <10000000>; /* input clk */
 			};
 			};

+ 3 - 3
arch/powerpc/boot/dts/fsl/t1024qds.dts

@@ -87,7 +87,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q128a11";  /* 16MB */
+				compatible = "micron,n25q128a11", "jedec,spi-nor";  /* 16MB */
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <10000000>;
 				spi-max-frequency = <10000000>;
 			};
 			};
@@ -95,7 +95,7 @@
 			flash@1 {
 			flash@1 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "sst,sst25wf040";  /* 512KB */
+				compatible = "sst,sst25wf040", "jedec,spi-nor";  /* 512KB */
 				reg = <1>;
 				reg = <1>;
 				spi-max-frequency = <10000000>;
 				spi-max-frequency = <10000000>;
 			};
 			};
@@ -103,7 +103,7 @@
 			flash@2 {
 			flash@2 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "eon,en25s64";   /* 8MB */
+				compatible = "eon,en25s64", "jedec,spi-nor";   /* 8MB */
 				reg = <2>;
 				reg = <2>;
 				spi-max-frequency = <10000000>;
 				spi-max-frequency = <10000000>;
 			};
 			};

+ 1 - 1
arch/powerpc/boot/dts/fsl/t1024rdb.dts

@@ -89,7 +89,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q512ax3";
+				compatible = "micron,n25q512ax3", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <10000000>; /* input clk */
 				spi-max-frequency = <10000000>; /* input clk */
 			};
 			};

+ 1 - 1
arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi

@@ -104,7 +104,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q512ax3";
+				compatible = "micron,n25q512ax3", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				/* input clock */
 				/* input clock */
 				spi-max-frequency = <10000000>;
 				spi-max-frequency = <10000000>;

+ 1 - 1
arch/powerpc/boot/dts/fsl/t104xqds.dtsi

@@ -261,7 +261,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q128a11";
+				compatible = "micron,n25q128a11", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <10000000>; /* input clock */
 				spi-max-frequency = <10000000>; /* input clock */
 			};
 			};

+ 1 - 1
arch/powerpc/boot/dts/fsl/t104xrdb.dtsi

@@ -109,7 +109,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q512a";
+				compatible = "micron,n25q512a", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <10000000>; /* input clock */
 				spi-max-frequency = <10000000>; /* input clock */
 			};
 			};

+ 3 - 3
arch/powerpc/boot/dts/fsl/t208xqds.dtsi

@@ -112,7 +112,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q128a11"; /* 16MB */
+				compatible = "micron,n25q128a11", "jedec,spi-nor"; /* 16MB */
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 			};
 			};
@@ -120,7 +120,7 @@
 			flash@1 {
 			flash@1 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "sst,sst25wf040";
+				compatible = "sst,sst25wf040", "jedec,spi-nor";
 				reg = <1>;
 				reg = <1>;
 				spi-max-frequency = <35000000>;
 				spi-max-frequency = <35000000>;
 			};
 			};
@@ -128,7 +128,7 @@
 			flash@2 {
 			flash@2 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "eon,en25s64";
+				compatible = "eon,en25s64", "jedec,spi-nor";
 				reg = <2>;
 				reg = <2>;
 				spi-max-frequency = <35000000>;
 				spi-max-frequency = <35000000>;
 			};
 			};

+ 1 - 1
arch/powerpc/boot/dts/fsl/t208xrdb.dtsi

@@ -113,7 +113,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "micron,n25q512a";
+				compatible = "micron,n25q512a", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <10000000>; /* input clock */
 				spi-max-frequency = <10000000>; /* input clock */
 			};
 			};

+ 1 - 1
arch/powerpc/boot/dts/fsl/t4240qds.dts

@@ -358,7 +358,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "sst,sst25wf040";
+				compatible = "sst,sst25wf040", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 			};
 			};

+ 1 - 1
arch/powerpc/boot/dts/fsl/t4240rdb.dts

@@ -118,7 +118,7 @@
 			flash@0 {
 			flash@0 {
 				#address-cells = <1>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 				#size-cells = <1>;
-				compatible = "sst,sst25wf040";
+				compatible = "sst,sst25wf040", "jedec,spi-nor";
 				reg = <0>;
 				reg = <0>;
 				spi-max-frequency = <40000000>; /* input clock */
 				spi-max-frequency = <40000000>; /* input clock */
 			};
 			};