Browse Source

Merge branch 'master' of git://git.denx.de/u-boot-spi

Conflicts:
	arch/arm/dts/armada-385-amc.dts
	arch/arm/dts/armada-xp-theadorable.dts
	arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi

Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini 5 years ago
parent
commit
216800acf1
100 changed files with 133 additions and 133 deletions
  1. 3 3
      MAINTAINERS
  2. 1 1
      arch/arc/dts/axs10x_mb.dtsi
  3. 1 1
      arch/arc/dts/hsdk.dts
  4. 1 1
      arch/arm/dts/am335x-brppt1-spi.dts
  5. 1 1
      arch/arm/dts/am437x-idk-evm.dts
  6. 1 1
      arch/arm/dts/am437x-sk-evm.dts
  7. 1 1
      arch/arm/dts/armada-3720-db.dts
  8. 1 1
      arch/arm/dts/armada-3720-espressobin.dts
  9. 1 1
      arch/arm/dts/armada-3720-turris-mox.dts
  10. 1 1
      arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
  11. 2 2
      arch/arm/dts/armada-38x-controlcenterdc.dts
  12. 1 1
      arch/arm/dts/armada-38x-solidrun-microsom.dtsi
  13. 1 1
      arch/arm/dts/armada-8040-clearfog-gt-8k.dts
  14. 1 1
      arch/arm/dts/armada-xp-theadorable.dts
  15. 1 1
      arch/arm/dts/at91-sama5d2_xplained.dts
  16. 1 1
      arch/arm/dts/at91-sama5d4_xplained.dts
  17. 1 1
      arch/arm/dts/at91-sama5d4ek.dts
  18. 1 1
      arch/arm/dts/at91sam9n12ek.dts
  19. 1 1
      arch/arm/dts/at91sam9x5ek.dtsi
  20. 2 2
      arch/arm/dts/bk4r1.dts
  21. 1 1
      arch/arm/dts/da850-evm-u-boot.dtsi
  22. 1 1
      arch/arm/dts/exynos5250-snow.dts
  23. 1 1
      arch/arm/dts/exynos5250-spring.dts
  24. 1 1
      arch/arm/dts/exynos5420-peach-pit.dts
  25. 1 1
      arch/arm/dts/fsl-ls1012a-2g5rdb.dts
  26. 1 1
      arch/arm/dts/fsl-ls1012a-frdm.dtsi
  27. 1 1
      arch/arm/dts/fsl-ls1012a-frwy.dts
  28. 4 4
      arch/arm/dts/fsl-ls1012a-qds.dtsi
  29. 1 1
      arch/arm/dts/fsl-ls1012a-rdb.dtsi
  30. 4 4
      arch/arm/dts/fsl-ls1043a-qds.dtsi
  31. 1 1
      arch/arm/dts/fsl-ls1043a-rdb.dts
  32. 4 4
      arch/arm/dts/fsl-ls1046a-qds.dtsi
  33. 2 2
      arch/arm/dts/fsl-ls1046a-rdb.dts
  34. 5 5
      arch/arm/dts/fsl-ls1088a-qds.dts
  35. 2 2
      arch/arm/dts/fsl-ls1088a-rdb.dts
  36. 4 4
      arch/arm/dts/fsl-ls2080a-qds.dts
  37. 1 1
      arch/arm/dts/fsl-ls2080a-rdb.dts
  38. 3 3
      arch/arm/dts/fsl-ls2081a-rdb.dts
  39. 3 3
      arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
  40. 2 2
      arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
  41. 2 2
      arch/arm/dts/imx6sx-sdb-u-boot.dtsi
  42. 1 1
      arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
  43. 1 1
      arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
  44. 1 1
      arch/arm/dts/imx6ull-14x14-evk.dts
  45. 1 1
      arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
  46. 1 1
      arch/arm/dts/keystone-k2e-evm.dts
  47. 2 2
      arch/arm/dts/keystone-k2g-evm.dts
  48. 1 1
      arch/arm/dts/keystone-k2g-ice.dts
  49. 1 1
      arch/arm/dts/keystone-k2hk-evm.dts
  50. 1 1
      arch/arm/dts/keystone-k2l-evm.dts
  51. 1 1
      arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
  52. 1 1
      arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
  53. 1 1
      arch/arm/dts/kirkwood-dreamplug.dts
  54. 1 1
      arch/arm/dts/kirkwood-lsxl.dtsi
  55. 1 1
      arch/arm/dts/kirkwood-netxbig.dtsi
  56. 1 1
      arch/arm/dts/kirkwood-ns2-common.dtsi
  57. 1 1
      arch/arm/dts/kirkwood-synology.dtsi
  58. 2 2
      arch/arm/dts/ls1021a-iot.dtsi
  59. 1 1
      arch/arm/dts/ls1021a-qds.dtsi
  60. 2 2
      arch/arm/dts/ls1021a-twr.dtsi
  61. 1 1
      arch/arm/dts/mt7629-rfb.dts
  62. 1 1
      arch/arm/dts/omap5-u-boot.dtsi
  63. 1 1
      arch/arm/dts/r8a77970-eagle-u-boot.dts
  64. 1 1
      arch/arm/dts/rk3288-veyron.dtsi
  65. 1 1
      arch/arm/dts/rk3368-lion.dts
  66. 1 1
      arch/arm/dts/rk3399-gru.dtsi
  67. 1 1
      arch/arm/dts/rk3399-puma.dtsi
  68. 1 1
      arch/arm/dts/rv1108-evb.dts
  69. 1 1
      arch/arm/dts/sama5d27_som1.dtsi
  70. 1 1
      arch/arm/dts/sama5d3xmb.dtsi
  71. 1 1
      arch/arm/dts/sama5d3xmb_cmp.dtsi
  72. 1 1
      arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi
  73. 1 1
      arch/arm/dts/socfpga_cyclone5_is1.dts
  74. 1 1
      arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi
  75. 1 1
      arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi
  76. 1 1
      arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi
  77. 1 1
      arch/arm/dts/socfpga_cyclone5_sr1500.dts
  78. 2 2
      arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi
  79. 1 1
      arch/arm/dts/stm32f746-disco.dts
  80. 1 1
      arch/arm/dts/stm32f769-disco.dts
  81. 2 2
      arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
  82. 1 1
      arch/arm/dts/stv0991.dts
  83. 1 1
      arch/arm/dts/zynq-zed.dts
  84. 1 1
      arch/arm/dts/zynqmp-zc1232-revA.dts
  85. 1 1
      arch/arm/dts/zynqmp-zc1254-revA.dts
  86. 1 1
      arch/arm/dts/zynqmp-zc1275-revA.dts
  87. 1 1
      arch/arm/dts/zynqmp-zc1275-revB.dts
  88. 1 1
      arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
  89. 1 1
      arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
  90. 1 1
      arch/arm/dts/zynqmp-zcu102-revA.dts
  91. 1 1
      arch/arm/dts/zynqmp-zcu104-revA.dts
  92. 1 1
      arch/arm/dts/zynqmp-zcu104-revC.dts
  93. 1 1
      arch/arm/dts/zynqmp-zcu106-revA.dts
  94. 1 1
      arch/arm/dts/zynqmp-zcu111-revA.dts
  95. 1 1
      arch/mips/dts/ap121.dts
  96. 1 1
      arch/mips/dts/ap143.dts
  97. 1 1
      arch/mips/dts/comtrend,ar-5315u.dts
  98. 1 1
      arch/mips/dts/comtrend,ar-5387un.dts
  99. 1 1
      arch/mips/dts/gardena-smart-gateway-mt7688.dts
  100. 1 1
      arch/mips/dts/jr2_pcb110.dts

+ 3 - 3
MAINTAINERS

@@ -310,7 +310,7 @@ F:	arch/arm/cpu/armv7/stv0991/
 F:	arch/arm/include/asm/arch-stv0991/
 
 ARM SUNXI
-M:	Jagan Teki <jagan@openedev.com>
+M:	Jagan Teki <jagan@amarulasolutions.com>
 M:	Maxime Ripard <maxime.ripard@bootlin.com>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-sunxi.git
@@ -691,14 +691,14 @@ T:	git git://git.denx.de/u-boot-sh.git
 F:	arch/sh/
 
 SPI
-M:	Jagan Teki <jagan@openedev.com>
+M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-spi.git
 F:	drivers/spi/
 F:	include/spi*
 
 SPI-NOR
-M:	Jagan Teki <jagan@openedev.com>
+M:	Jagan Teki <jagan@amarulasolutions.com>
 M:	Vignesh R <vigneshr@ti.com>
 S:	Maintained
 F:	drivers/mtd/spi/

+ 1 - 1
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>;
 			};

+ 1 - 1
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>;
 		};

+ 1 - 1
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>;
 	};

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 2 - 2
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;

+ 1 - 1
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";

+ 1 - 1
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>;
 

+ 1 - 1
arch/arm/dts/armada-xp-theadorable.dts

@@ -162,7 +162,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>;
 	};

+ 1 - 1
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;

+ 1 - 1
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>;
 				};

+ 1 - 1
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>;
 				};

+ 1 - 1
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>;
 				};

+ 1 - 1
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>;
 				};

+ 2 - 2
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>;
 	};

+ 1 - 1
arch/arm/dts/da850-evm-u-boot.dtsi

@@ -13,7 +13,7 @@
 };
 
 &flash {
-	compatible = "m25p64", "spi-flash";
+	compatible = "m25p64", "jedec,spi-nor";
 };
 
 &mmc0 {

+ 1 - 1
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>;
 		};
 	};

+ 1 - 1
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>;
 		};
 	};

+ 1 - 1
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>;
 
 			/*

+ 1 - 1
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>;
 	};

+ 1 - 1
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>;
 	};

+ 1 - 1
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>;
 	};

+ 4 - 4
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>;
 	};

+ 1 - 1
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>;
 	};

+ 4 - 4
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>;
 	};

+ 1 - 1
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 */
 	};

+ 4 - 4
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>;
 	};

+ 2 - 2
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>;
 	 };

+ 5 - 5
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>;
 	 };

+ 2 - 2
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>;
 	 };

+ 4 - 4
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>;
 	};

+ 1 - 1
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;

+ 3 - 3
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>;
 	};

+ 3 - 3
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>;
 	};

+ 2 - 2
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";
 	};
 };

+ 2 - 2
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";
 	};
 };

+ 1 - 1
arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi

@@ -5,6 +5,6 @@
 
 &qspi {
 	flash0: n25q256a@0 {
-		compatible = "spi-flash";
+		compatible = "jedec,spi-nor";
 	};
 };

+ 1 - 1
arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi

@@ -5,6 +5,6 @@
 
 &qspi {
 	flash0: n25q256a@0 {
-		compatible = "spi-flash";
+		compatible = "jedec,spi-nor";
 	};
 };

+ 1 - 1
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>;

+ 1 - 1
arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi

@@ -5,6 +5,6 @@
 
 &qspi1 {
 	flash0: mx25l51245g@0 {
-		compatible = "spi-flash";
+		compatible = "jedec,spi-nor";
 	};
 };

+ 1 - 1
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>;

+ 2 - 2
arch/arm/dts/keystone-k2g-evm.dts

@@ -74,7 +74,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>;
@@ -96,7 +96,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>;

+ 1 - 1
arch/arm/dts/keystone-k2g-ice.dts

@@ -39,7 +39,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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 2 - 2
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;

+ 1 - 1
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>;
 	};

+ 2 - 2
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;

+ 1 - 1
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;
 	};

+ 1 - 1
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;
 	};
 };

+ 1 - 1
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>;

+ 1 - 1
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>;
 	};

+ 1 - 1
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;

+ 1 - 1
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. */

+ 1 - 1
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;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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;

+ 1 - 1
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>;
 				};

+ 1 - 1
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;
 };
 

+ 1 - 1
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;

+ 1 - 1
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 {

+ 1 - 1
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;
 };
 

+ 1 - 1
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;
 };
 

+ 1 - 1
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;

+ 2 - 2
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;
 	};
 };

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 2 - 2
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi

@@ -16,12 +16,12 @@
 };
 
 &flash0 {
-	compatible = "spi-flash";
+	compatible = "jedec,spi-nor";
 	u-boot,dm-spl;
 };
 
 &flash1 {
-	compatible = "spi-flash";
+	compatible = "jedec,spi-nor";
 };
 
 &qspi {

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;

+ 1 - 1
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>;
 	};

+ 1 - 1
arch/mips/dts/jr2_pcb110.dts

@@ -44,7 +44,7 @@
 &spi0 {
 	status = "okay";
 	spi-flash@0 {
-		compatible = "spi-flash";
+		compatible = "jedec,spi-nor";
 		spi-max-frequency = <18000000>; /* input clock */
 		reg = <0>; /* CS0 */
 	};

Some files were not shown because too many files changed in this diff