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>

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

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

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

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

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

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

arch/mips/dts/jr2_pcb111.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 */
 	};

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

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;

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;

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

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

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

arch/mips/dts/serval2_pcb112.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 */
 	};

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;

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;

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;

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