ramips: update DTS files to use jedec,spi-nor compatible string for m25p80 to fix probe issues

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 47935

target/linux/ramips/dts/3G150B.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/3G300M.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/A5-V11.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "pm25lq032";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "pm25lq032";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/AI-BR100.dts

@@ -21,7 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/AIR3GII.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q32b";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q32b";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ALL0256N-4M.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ALL0256N-8M.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ALL5002.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l25635e";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l25635e";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ALL5003.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l25635e";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l25635e";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ASL26555-16M.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25sl12801";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25sl12801";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ASL26555-8M.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25sl064p";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25sl064p";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/AWAPN2403.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/AWM002-4M.dtsi

@@ -7,7 +7,7 @@
 	palmbus@10000000 {
 		spi@b00 {
 			m25p80@0 {
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				linux,modalias = "m25p80", "mx25l3205d";
 			};
 		};

target/linux/ramips/dts/AWM002-8M.dtsi

@@ -7,7 +7,7 @@
 	palmbus@10000000 {
 		spi@b00 {
 			m25p80@0 {
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				linux,modalias = "m25p80", "mx25l6405d";
 			};
 		};

target/linux/ramips/dts/AWM002.dtsi

@@ -12,6 +12,7 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 				reg = <0 0>;
+				compatible = "jedec,spi-nor";
 				spi-max-frequency = <10000000>;
 
 				partition@0 {

target/linux/ramips/dts/AWM003-EVB.dts

@@ -14,7 +14,7 @@
 	palmbus@10000000 {
 		spi@b00 {
 			m25p80@0 {
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				linux,modalias = "m25p80", "mx25l6405d";
 			};
 		};

target/linux/ramips/dts/ArcherC20i.dts

@@ -21,7 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/CF-WR800N.dts

@@ -33,7 +33,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/DCS-930L-B1.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/DIR-300-B7.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/DIR-320-B1.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/DIR-610-A1.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "f25l32pa", "m25p80";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/DIR-615-H1.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/DIR-620-D1.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/DIR-645.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <25000000>;

target/linux/ramips/dts/DIR-810L.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/DIR-860L-B1.dts

@@ -22,7 +22,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l12805d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/E1700.dts

@@ -23,7 +23,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/F7C027.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l12805d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l12805d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/FIREWRT.dts

@@ -26,7 +26,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/HC5XXX.dtsi

@@ -30,7 +30,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q128";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/HLKRM04.dts

@@ -26,7 +26,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "gd25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/HPM.dts

@@ -15,7 +15,7 @@
 			status = "okay";
 
 			m25p80@0 {
-				compatible = "macronix,mx25l12805d";
+				compatible = "jedec,spi-nor";
 				spi-max-frequency = <25000000>;
 				reg = <0>;
 				#address-cells = <1>;

target/linux/ramips/dts/HT-TM02.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/LINKIT7688.dts

@@ -69,7 +69,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l25635e";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l25635e";
 				spi-max-frequency = <40000000>;

target/linux/ramips/dts/M2M.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/M3.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q32";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q32";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/M4-4M.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "pm25lq032";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "pm25lq032";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/M4-8M.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "gd25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "gd25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MINIEMBPLUG.dts

@@ -71,7 +71,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MIWIFI-MINI.dts

@@ -29,7 +29,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q128";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MLW221.dts

@@ -25,7 +25,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl129p1";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl129p1";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MLWG2.dts

@@ -25,7 +25,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l12805d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MPRA1.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MPRA2.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MT7620a.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MT7620a_MT7530.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MT7620a_MT7610e.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <1000000>;

target/linux/ramips/dts/MT7628.dts

@@ -27,7 +27,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MZK-750DHP.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MZK-DP150N.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/MicroWRT.dts

@@ -25,7 +25,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q128";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/NCS601W.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/NW718.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <25000000>;

target/linux/ramips/dts/OY-0001.dts

@@ -25,7 +25,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q128";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/PBR-M1.dts

@@ -32,7 +32,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q256";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/PX-4885-4M.dts

@@ -10,7 +10,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/PX-4885-8M.dts

@@ -10,7 +10,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/RE6500.dts

@@ -22,7 +22,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/RP-N53.dts

@@ -27,7 +27,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/RT-G32-B1.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/RT-N14U.dts

@@ -21,8 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				#compatible = "mx25l6405d";
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q128";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/RT5350F-OLINUXINO.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl064k";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/RUT5XX.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "n25q128a13";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "n25q128a13";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/SAP-G3200U3.dts

@@ -22,7 +22,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/TINY-AC.dts

@@ -29,7 +29,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/UBNT-ERX.dts

@@ -27,7 +27,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "m25p80";
+				compatible = "jedec,spi-nor";
 				reg = <1>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/VOCORE-16M.dts

@@ -8,7 +8,7 @@
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "w25q128";
+		compatible = "jedec,spi-nor";
 		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;

target/linux/ramips/dts/VOCORE-8M.dts

@@ -8,7 +8,7 @@
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "s25fl064k";
+		compatible = "jedec,spi-nor";
 		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;

target/linux/ramips/dts/WHR-1166D.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WHR-300HP2.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WHR-600D.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l6405d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WIZARD8800.dts

@@ -21,7 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q32";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q32";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WIZFI630A.dts

@@ -21,7 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0>;
 				linux,modalias = "m25p80", "w25q128";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WL-330N.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WL-330N3G.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WMR-300.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WNCE2001.dts

@@ -17,7 +17,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WRTNODE.dts

@@ -25,7 +25,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l12805d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q128";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WSR-1166.dts

@@ -22,7 +22,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l12805d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WSR-600.dts

@@ -22,7 +22,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l12805d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WT1520-4M.dts

@@ -10,7 +10,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q32";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WT1520-8M.dts

@@ -10,7 +10,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "s25fl064k";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WT3020-4M.dts

@@ -21,7 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q32";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q32";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/WT3020-8M.dts

@@ -21,7 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/X5.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "gd25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "gd25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/X8.dts

@@ -13,7 +13,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "gd25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "gd25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/Y1.dtsi

@@ -24,7 +24,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q128";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/YOUKU-YK1.dts

@@ -30,7 +30,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q256";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "w25q256";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ZBT-WA05.dts

@@ -29,7 +29,7 @@
 			en25q64@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ZBT-WG2626.dts

@@ -26,7 +26,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "w25q128";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ZBT-WR8305RT.dts

@@ -21,7 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l6405d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <10000000>;

target/linux/ramips/dts/ZTE-Q7.dts

@@ -21,7 +21,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "en25q64";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "en25q64";
 				spi-max-frequency = <10000000>;