From 05b1fcc70b4cd65f069ce0640b5130484c58c227 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Thu, 2 Feb 2017 22:11:23 +0100 Subject: [PATCH] ramips: cleanup SPI flash device tree properties usage Use only the jedec,spi-nor compatible string. Everything else either never worked or is only support to keep compatibility. Remove the linux,modalias property. It is obsolete since kernel 4.4. Signed-off-by: Mathias Kresin --- target/linux/ramips/dts/3G150B.dts | 1 - target/linux/ramips/dts/3G300M.dts | 1 - target/linux/ramips/dts/A5-V11.dts | 1 - target/linux/ramips/dts/AI-BR100.dts | 1 - target/linux/ramips/dts/AIR3GII.dts | 1 - target/linux/ramips/dts/ALL0256N-4M.dts | 1 - target/linux/ramips/dts/ALL0256N-8M.dts | 1 - target/linux/ramips/dts/ALL5002.dts | 1 - target/linux/ramips/dts/ALL5003.dts | 1 - target/linux/ramips/dts/ASL26555-16M.dts | 1 - target/linux/ramips/dts/ASL26555-8M.dts | 1 - target/linux/ramips/dts/AWAPN2403.dts | 1 - target/linux/ramips/dts/AWM002-4M.dtsi | 1 - target/linux/ramips/dts/AWM002-8M.dtsi | 1 - target/linux/ramips/dts/AWM003-EVB.dts | 1 - target/linux/ramips/dts/ArcherC20i.dts | 1 - target/linux/ramips/dts/ArcherC50.dts | 1 - target/linux/ramips/dts/ArcherMR200.dts | 1 - target/linux/ramips/dts/CF-WR800N.dts | 1 - target/linux/ramips/dts/CS-QR10.dts | 1 - target/linux/ramips/dts/DB-WRT01.dts | 1 - target/linux/ramips/dts/DCH-M225.dts | 1 - target/linux/ramips/dts/DCS-930L-B1.dts | 1 - target/linux/ramips/dts/DIR-300-B7.dts | 1 - target/linux/ramips/dts/DIR-320-B1.dts | 1 - target/linux/ramips/dts/DIR-610-A1.dts | 1 - target/linux/ramips/dts/DIR-615-H1.dts | 1 - target/linux/ramips/dts/DIR-620-D1.dts | 1 - target/linux/ramips/dts/DIR-645.dts | 1 - target/linux/ramips/dts/DIR-810L.dts | 1 - target/linux/ramips/dts/DUZUN-DM06.dts | 1 - target/linux/ramips/dts/E1700.dts | 1 - target/linux/ramips/dts/F7C027.dts | 1 - target/linux/ramips/dts/GL-MT300A.dts | 3 +-- target/linux/ramips/dts/GL-MT300N.dts | 3 +-- target/linux/ramips/dts/GL-MT750.dts | 3 +-- target/linux/ramips/dts/HC5XXX.dtsi | 1 - target/linux/ramips/dts/HLKRM04.dts | 1 - target/linux/ramips/dts/HT-TM02.dts | 1 - target/linux/ramips/dts/JHR-N805R.dts | 1 - target/linux/ramips/dts/LINKIT7688.dts | 1 - target/linux/ramips/dts/M2M.dts | 1 - target/linux/ramips/dts/M3.dts | 1 - target/linux/ramips/dts/M4-4M.dts | 1 - target/linux/ramips/dts/M4-8M.dts | 1 - target/linux/ramips/dts/MAC1200RV2.dts | 3 +-- target/linux/ramips/dts/MINIEMBPLUG.dts | 1 - target/linux/ramips/dts/MIWIFI-MINI.dts | 1 - target/linux/ramips/dts/MIWIFI-NANO.dts | 1 - target/linux/ramips/dts/MLW221.dts | 1 - target/linux/ramips/dts/MLWG2.dts | 1 - target/linux/ramips/dts/MPRA1.dts | 1 - target/linux/ramips/dts/MPRA2.dts | 1 - target/linux/ramips/dts/MT7620a.dts | 1 - target/linux/ramips/dts/MT7620a_MT7530.dts | 1 - target/linux/ramips/dts/MT7620a_MT7610e.dts | 1 - target/linux/ramips/dts/MT7628.dts | 1 - target/linux/ramips/dts/MZK-750DHP.dts | 1 - target/linux/ramips/dts/MZK-DP150N.dts | 1 - target/linux/ramips/dts/MZK-EX300NP.dts | 1 - target/linux/ramips/dts/MZK-EX750NP.dts | 1 - target/linux/ramips/dts/MicroWRT.dts | 1 - target/linux/ramips/dts/NBG-419N2.dts | 3 +-- target/linux/ramips/dts/NCS601W.dts | 1 - target/linux/ramips/dts/NIXCORE-16M.dts | 1 - target/linux/ramips/dts/NIXCORE-8M.dts | 1 - target/linux/ramips/dts/NW718.dts | 1 - target/linux/ramips/dts/OY-0001.dts | 1 - target/linux/ramips/dts/PBR-D1.dts | 1 - target/linux/ramips/dts/PSG1208.dts | 1 - target/linux/ramips/dts/PSG1218.dts | 1 - target/linux/ramips/dts/PX-4885-4M.dts | 1 - target/linux/ramips/dts/PX-4885-8M.dts | 1 - target/linux/ramips/dts/RP-N53.dts | 1 - target/linux/ramips/dts/RT-G32-B1.dts | 1 - target/linux/ramips/dts/RT-N14U.dts | 1 - target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts | 1 - target/linux/ramips/dts/RT5350F-OLINUXINO.dts | 1 - target/linux/ramips/dts/RUT5XX.dts | 1 - target/linux/ramips/dts/TEW-714TRU.dts | 1 - target/linux/ramips/dts/TINY-AC.dts | 1 - target/linux/ramips/dts/VOCORE-16M.dts | 1 - target/linux/ramips/dts/VOCORE-8M.dts | 1 - target/linux/ramips/dts/WHR-1166D.dts | 1 - target/linux/ramips/dts/WHR-300HP2.dts | 1 - target/linux/ramips/dts/WHR-600D.dts | 1 - target/linux/ramips/dts/WIDORA-NEO.dts | 1 - target/linux/ramips/dts/WIZARD8800.dts | 1 - target/linux/ramips/dts/WIZFI630A.dts | 1 - target/linux/ramips/dts/WL-330N.dts | 1 - target/linux/ramips/dts/WL-330N3G.dts | 1 - target/linux/ramips/dts/WL-WN575A3.dts | 1 - target/linux/ramips/dts/WMR-300.dts | 1 - target/linux/ramips/dts/WNCE2001.dts | 1 - target/linux/ramips/dts/WRH-300CR.dts | 1 - target/linux/ramips/dts/WRTNODE.dts | 1 - target/linux/ramips/dts/WT1520-4M.dts | 1 - target/linux/ramips/dts/WT1520-8M.dts | 1 - target/linux/ramips/dts/WT3020-4M.dts | 1 - target/linux/ramips/dts/WT3020-8M.dts | 1 - target/linux/ramips/dts/X5.dts | 1 - target/linux/ramips/dts/X8.dts | 1 - target/linux/ramips/dts/Y1.dtsi | 1 - target/linux/ramips/dts/YOUKU-YK1.dts | 1 - target/linux/ramips/dts/ZBT-APE522II.dts | 1 - target/linux/ramips/dts/ZBT-CPE102.dts | 1 - target/linux/ramips/dts/ZBT-WA05.dts | 1 - target/linux/ramips/dts/ZBT-WE826.dts | 3 +-- target/linux/ramips/dts/ZBT-WR8305RT.dts | 1 - target/linux/ramips/dts/ZTE-Q7.dts | 1 - 110 files changed, 6 insertions(+), 116 deletions(-) diff --git a/target/linux/ramips/dts/3G150B.dts b/target/linux/ramips/dts/3G150B.dts index b64f9403676c..e242e3360ecc 100644 --- a/target/linux/ramips/dts/3G150B.dts +++ b/target/linux/ramips/dts/3G150B.dts @@ -55,7 +55,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/3G300M.dts index 4d19bca6dad3..8ca8d1544674 100644 --- a/target/linux/ramips/dts/3G300M.dts +++ b/target/linux/ramips/dts/3G300M.dts @@ -70,7 +70,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/A5-V11.dts b/target/linux/ramips/dts/A5-V11.dts index 748e1edac759..d755695de394 100644 --- a/target/linux/ramips/dts/A5-V11.dts +++ b/target/linux/ramips/dts/A5-V11.dts @@ -61,7 +61,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "pm25lq032"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/AI-BR100.dts b/target/linux/ramips/dts/AI-BR100.dts index 2405ae700fd3..b21e4c25ca00 100644 --- a/target/linux/ramips/dts/AI-BR100.dts +++ b/target/linux/ramips/dts/AI-BR100.dts @@ -52,7 +52,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0 0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts index 4d9a3b543248..e9c1434734c7 100644 --- a/target/linux/ramips/dts/AIR3GII.dts +++ b/target/linux/ramips/dts/AIR3GII.dts @@ -48,7 +48,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q32b"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ALL0256N-4M.dts b/target/linux/ramips/dts/ALL0256N-4M.dts index abe43d124a45..b4d421fc29b6 100644 --- a/target/linux/ramips/dts/ALL0256N-4M.dts +++ b/target/linux/ramips/dts/ALL0256N-4M.dts @@ -53,7 +53,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ALL0256N-8M.dts b/target/linux/ramips/dts/ALL0256N-8M.dts index 45c5d3376deb..704e60625fb6 100644 --- a/target/linux/ramips/dts/ALL0256N-8M.dts +++ b/target/linux/ramips/dts/ALL0256N-8M.dts @@ -53,7 +53,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ALL5002.dts b/target/linux/ramips/dts/ALL5002.dts index 66ed0179a33e..ddfe811d9d7d 100644 --- a/target/linux/ramips/dts/ALL5002.dts +++ b/target/linux/ramips/dts/ALL5002.dts @@ -54,7 +54,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l25635e"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/ALL5003.dts index dfb97e6d9b93..f507aa91b224 100644 --- a/target/linux/ramips/dts/ALL5003.dts +++ b/target/linux/ramips/dts/ALL5003.dts @@ -54,7 +54,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l25635e"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ASL26555-16M.dts b/target/linux/ramips/dts/ASL26555-16M.dts index 460fe05efaa9..83798513fd1b 100644 --- a/target/linux/ramips/dts/ASL26555-16M.dts +++ b/target/linux/ramips/dts/ASL26555-16M.dts @@ -84,7 +84,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25sl12801"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ASL26555-8M.dts b/target/linux/ramips/dts/ASL26555-8M.dts index 288f5552a849..2c6a46202688 100644 --- a/target/linux/ramips/dts/ASL26555-8M.dts +++ b/target/linux/ramips/dts/ASL26555-8M.dts @@ -84,7 +84,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25sl064p"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/AWAPN2403.dts b/target/linux/ramips/dts/AWAPN2403.dts index a1b5b217b22e..06bfac0578ea 100644 --- a/target/linux/ramips/dts/AWAPN2403.dts +++ b/target/linux/ramips/dts/AWAPN2403.dts @@ -39,7 +39,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/AWM002-4M.dtsi b/target/linux/ramips/dts/AWM002-4M.dtsi index 69d25bb5d455..3ea20e6a951a 100644 --- a/target/linux/ramips/dts/AWM002-4M.dtsi +++ b/target/linux/ramips/dts/AWM002-4M.dtsi @@ -7,5 +7,4 @@ &m25p80 { compatible = "jedec,spi-nor"; - linux,modalias = "m25p80", "mx25l3205d"; }; diff --git a/target/linux/ramips/dts/AWM002-8M.dtsi b/target/linux/ramips/dts/AWM002-8M.dtsi index 1e6970ddec4f..3ea20e6a951a 100644 --- a/target/linux/ramips/dts/AWM002-8M.dtsi +++ b/target/linux/ramips/dts/AWM002-8M.dtsi @@ -7,5 +7,4 @@ &m25p80 { compatible = "jedec,spi-nor"; - linux,modalias = "m25p80", "mx25l6405d"; }; diff --git a/target/linux/ramips/dts/AWM003-EVB.dts b/target/linux/ramips/dts/AWM003-EVB.dts index b42d77ed2fb9..7c23f34c26e6 100644 --- a/target/linux/ramips/dts/AWM003-EVB.dts +++ b/target/linux/ramips/dts/AWM003-EVB.dts @@ -54,7 +54,6 @@ &m25p80 { compatible = "jedec,spi-nor"; - linux,modalias = "m25p80", "mx25l6405d"; }; ðernet { diff --git a/target/linux/ramips/dts/ArcherC20i.dts b/target/linux/ramips/dts/ArcherC20i.dts index cbbdf8ab803e..5d0fc308c3cd 100644 --- a/target/linux/ramips/dts/ArcherC20i.dts +++ b/target/linux/ramips/dts/ArcherC20i.dts @@ -73,7 +73,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ArcherC50.dts b/target/linux/ramips/dts/ArcherC50.dts index c9863a1f319a..ac392f390bfb 100644 --- a/target/linux/ramips/dts/ArcherC50.dts +++ b/target/linux/ramips/dts/ArcherC50.dts @@ -95,7 +95,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ArcherMR200.dts b/target/linux/ramips/dts/ArcherMR200.dts index 25be6bcd6b7d..f41014bbf65d 100644 --- a/target/linux/ramips/dts/ArcherMR200.dts +++ b/target/linux/ramips/dts/ArcherMR200.dts @@ -117,7 +117,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/CF-WR800N.dts b/target/linux/ramips/dts/CF-WR800N.dts index 6ce4b27301fb..9fcab024626f 100644 --- a/target/linux/ramips/dts/CF-WR800N.dts +++ b/target/linux/ramips/dts/CF-WR800N.dts @@ -69,7 +69,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/CS-QR10.dts b/target/linux/ramips/dts/CS-QR10.dts index bdd828fe8fde..e3611c226c89 100644 --- a/target/linux/ramips/dts/CS-QR10.dts +++ b/target/linux/ramips/dts/CS-QR10.dts @@ -82,7 +82,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DB-WRT01.dts b/target/linux/ramips/dts/DB-WRT01.dts index 400c5ef51b4b..c4a32ea9e9a2 100644 --- a/target/linux/ramips/dts/DB-WRT01.dts +++ b/target/linux/ramips/dts/DB-WRT01.dts @@ -43,7 +43,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/DCH-M225.dts index 21133a9b88cd..3465c70ad0e0 100644 --- a/target/linux/ramips/dts/DCH-M225.dts +++ b/target/linux/ramips/dts/DCH-M225.dts @@ -100,7 +100,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <80000000>; m25p,fast-read; diff --git a/target/linux/ramips/dts/DCS-930L-B1.dts b/target/linux/ramips/dts/DCS-930L-B1.dts index 17996d2358c2..8ebc1bb3d27b 100644 --- a/target/linux/ramips/dts/DCS-930L-B1.dts +++ b/target/linux/ramips/dts/DCS-930L-B1.dts @@ -50,7 +50,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DIR-300-B7.dts b/target/linux/ramips/dts/DIR-300-B7.dts index fb93f5d646e1..9bb4345e33e8 100644 --- a/target/linux/ramips/dts/DIR-300-B7.dts +++ b/target/linux/ramips/dts/DIR-300-B7.dts @@ -50,7 +50,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DIR-320-B1.dts b/target/linux/ramips/dts/DIR-320-B1.dts index 2335c9a391e9..07162298352f 100644 --- a/target/linux/ramips/dts/DIR-320-B1.dts +++ b/target/linux/ramips/dts/DIR-320-B1.dts @@ -72,7 +72,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/DIR-610-A1.dts index e69997f47464..a70b4604b01a 100644 --- a/target/linux/ramips/dts/DIR-610-A1.dts +++ b/target/linux/ramips/dts/DIR-610-A1.dts @@ -50,7 +50,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/DIR-615-H1.dts index 9fbd7356c496..a2873be5da8b 100644 --- a/target/linux/ramips/dts/DIR-615-H1.dts +++ b/target/linux/ramips/dts/DIR-615-H1.dts @@ -65,7 +65,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DIR-620-D1.dts b/target/linux/ramips/dts/DIR-620-D1.dts index 1bdcaffb4ac6..f3079d370366 100644 --- a/target/linux/ramips/dts/DIR-620-D1.dts +++ b/target/linux/ramips/dts/DIR-620-D1.dts @@ -44,7 +44,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts index 30eccaf5f591..9c8082ca2443 100644 --- a/target/linux/ramips/dts/DIR-645.dts +++ b/target/linux/ramips/dts/DIR-645.dts @@ -72,7 +72,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <25000000>; partition@0 { diff --git a/target/linux/ramips/dts/DIR-810L.dts b/target/linux/ramips/dts/DIR-810L.dts index 4ccea0d45b03..9621183e07c6 100644 --- a/target/linux/ramips/dts/DIR-810L.dts +++ b/target/linux/ramips/dts/DIR-810L.dts @@ -55,7 +55,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/DUZUN-DM06.dts b/target/linux/ramips/dts/DUZUN-DM06.dts index 5715791a6880..d40df4fb5c68 100644 --- a/target/linux/ramips/dts/DUZUN-DM06.dts +++ b/target/linux/ramips/dts/DUZUN-DM06.dts @@ -126,7 +126,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <60000000>; m25p,chunked-io = <32>; m25p,fast-read; diff --git a/target/linux/ramips/dts/E1700.dts b/target/linux/ramips/dts/E1700.dts index 050303a41364..cb3d2ec83a30 100644 --- a/target/linux/ramips/dts/E1700.dts +++ b/target/linux/ramips/dts/E1700.dts @@ -60,7 +60,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/F7C027.dts b/target/linux/ramips/dts/F7C027.dts index d6a150a4a775..10d26a4e484e 100644 --- a/target/linux/ramips/dts/F7C027.dts +++ b/target/linux/ramips/dts/F7C027.dts @@ -66,7 +66,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l12805d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/GL-MT300A.dts b/target/linux/ramips/dts/GL-MT300A.dts index 32e1fe01ad7d..a700558a031f 100644 --- a/target/linux/ramips/dts/GL-MT300A.dts +++ b/target/linux/ramips/dts/GL-MT300A.dts @@ -84,9 +84,8 @@ m25p80@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "w25q128"; + compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/GL-MT300N.dts b/target/linux/ramips/dts/GL-MT300N.dts index 7334bc7a2e96..be78a72b5035 100644 --- a/target/linux/ramips/dts/GL-MT300N.dts +++ b/target/linux/ramips/dts/GL-MT300N.dts @@ -79,9 +79,8 @@ m25p80@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "w25q128"; + compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/GL-MT750.dts b/target/linux/ramips/dts/GL-MT750.dts index 939d012594ac..ad1e3f91735d 100644 --- a/target/linux/ramips/dts/GL-MT750.dts +++ b/target/linux/ramips/dts/GL-MT750.dts @@ -79,9 +79,8 @@ m25p80@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "w25q128"; + compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/HC5XXX.dtsi b/target/linux/ramips/dts/HC5XXX.dtsi index 54bf40936e4a..3bea77e2331b 100644 --- a/target/linux/ramips/dts/HC5XXX.dtsi +++ b/target/linux/ramips/dts/HC5XXX.dtsi @@ -58,7 +58,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/HLKRM04.dts b/target/linux/ramips/dts/HLKRM04.dts index cbd860967a8a..79a599d49e27 100644 --- a/target/linux/ramips/dts/HLKRM04.dts +++ b/target/linux/ramips/dts/HLKRM04.dts @@ -66,7 +66,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/HT-TM02.dts b/target/linux/ramips/dts/HT-TM02.dts index 8dc2dbc52413..0bfe48f3d4e8 100644 --- a/target/linux/ramips/dts/HT-TM02.dts +++ b/target/linux/ramips/dts/HT-TM02.dts @@ -55,7 +55,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/JHR-N805R.dts b/target/linux/ramips/dts/JHR-N805R.dts index 20cdb8487608..4493b3c30d2f 100644 --- a/target/linux/ramips/dts/JHR-N805R.dts +++ b/target/linux/ramips/dts/JHR-N805R.dts @@ -48,7 +48,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts index 210d4d0b8d10..f1809d169a15 100644 --- a/target/linux/ramips/dts/LINKIT7688.dts +++ b/target/linux/ramips/dts/LINKIT7688.dts @@ -118,7 +118,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l25635e"; spi-max-frequency = <40000000>; m25p,chunked-io = <31>; diff --git a/target/linux/ramips/dts/M2M.dts b/target/linux/ramips/dts/M2M.dts index 99e7b6a44b4d..74d66d5ff5d7 100644 --- a/target/linux/ramips/dts/M2M.dts +++ b/target/linux/ramips/dts/M2M.dts @@ -54,7 +54,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/M3.dts b/target/linux/ramips/dts/M3.dts index f4169c779cad..19ccf3ddfad4 100644 --- a/target/linux/ramips/dts/M3.dts +++ b/target/linux/ramips/dts/M3.dts @@ -46,7 +46,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q32"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/M4-4M.dts b/target/linux/ramips/dts/M4-4M.dts index c6ed68390959..3e147e53b383 100644 --- a/target/linux/ramips/dts/M4-4M.dts +++ b/target/linux/ramips/dts/M4-4M.dts @@ -39,7 +39,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "pm25lq032"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/M4-8M.dts b/target/linux/ramips/dts/M4-8M.dts index 75c7e5338810..65a3972d7d37 100644 --- a/target/linux/ramips/dts/M4-8M.dts +++ b/target/linux/ramips/dts/M4-8M.dts @@ -39,7 +39,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "gd25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MAC1200RV2.dts b/target/linux/ramips/dts/MAC1200RV2.dts index 0929a013fdef..73ba493c5de7 100644 --- a/target/linux/ramips/dts/MAC1200RV2.dts +++ b/target/linux/ramips/dts/MAC1200RV2.dts @@ -30,9 +30,8 @@ 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>; m25p,chunked-io = <32>; diff --git a/target/linux/ramips/dts/MINIEMBPLUG.dts b/target/linux/ramips/dts/MINIEMBPLUG.dts index 5f1cfe93cba2..45616ef28a18 100644 --- a/target/linux/ramips/dts/MINIEMBPLUG.dts +++ b/target/linux/ramips/dts/MINIEMBPLUG.dts @@ -75,7 +75,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MIWIFI-MINI.dts b/target/linux/ramips/dts/MIWIFI-MINI.dts index d8c5e7cd1fb8..45e1f2ef5f7c 100644 --- a/target/linux/ramips/dts/MIWIFI-MINI.dts +++ b/target/linux/ramips/dts/MIWIFI-MINI.dts @@ -65,7 +65,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MIWIFI-NANO.dts b/target/linux/ramips/dts/MIWIFI-NANO.dts index dfe9ef5707cc..d262d8cf2cde 100644 --- a/target/linux/ramips/dts/MIWIFI-NANO.dts +++ b/target/linux/ramips/dts/MIWIFI-NANO.dts @@ -75,7 +75,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; m25p,chunked-io = <32>; diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/MLW221.dts index 05d7dfff8a45..f02602fb9f2f 100644 --- a/target/linux/ramips/dts/MLW221.dts +++ b/target/linux/ramips/dts/MLW221.dts @@ -62,7 +62,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl129p1"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MLWG2.dts b/target/linux/ramips/dts/MLWG2.dts index 9c71c91c1c48..fc281934e161 100644 --- a/target/linux/ramips/dts/MLWG2.dts +++ b/target/linux/ramips/dts/MLWG2.dts @@ -62,7 +62,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MPRA1.dts b/target/linux/ramips/dts/MPRA1.dts index e97e60ca59f1..9762658c72c0 100644 --- a/target/linux/ramips/dts/MPRA1.dts +++ b/target/linux/ramips/dts/MPRA1.dts @@ -61,7 +61,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts index 72ee8768b6bd..30ab50f33d71 100644 --- a/target/linux/ramips/dts/MPRA2.dts +++ b/target/linux/ramips/dts/MPRA2.dts @@ -61,7 +61,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/MT7620a.dts index 8f1b6d952106..3ed22d5c9ab9 100644 --- a/target/linux/ramips/dts/MT7620a.dts +++ b/target/linux/ramips/dts/MT7620a.dts @@ -36,7 +36,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MT7620a_MT7530.dts b/target/linux/ramips/dts/MT7620a_MT7530.dts index 5885ed045d09..70f92536f3bd 100644 --- a/target/linux/ramips/dts/MT7620a_MT7530.dts +++ b/target/linux/ramips/dts/MT7620a_MT7530.dts @@ -15,7 +15,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MT7620a_MT7610e.dts b/target/linux/ramips/dts/MT7620a_MT7610e.dts index da241a425310..1670b9c86b02 100644 --- a/target/linux/ramips/dts/MT7620a_MT7610e.dts +++ b/target/linux/ramips/dts/MT7620a_MT7610e.dts @@ -40,7 +40,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <1000000>; partition@0 { diff --git a/target/linux/ramips/dts/MT7628.dts b/target/linux/ramips/dts/MT7628.dts index a4b066cfd5ad..dc86c701353c 100644 --- a/target/linux/ramips/dts/MT7628.dts +++ b/target/linux/ramips/dts/MT7628.dts @@ -33,7 +33,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; m25p,chunked-io = <32>; diff --git a/target/linux/ramips/dts/MZK-750DHP.dts b/target/linux/ramips/dts/MZK-750DHP.dts index 5a2e4b49bf8e..dfefb0e3201f 100644 --- a/target/linux/ramips/dts/MZK-750DHP.dts +++ b/target/linux/ramips/dts/MZK-750DHP.dts @@ -63,7 +63,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MZK-DP150N.dts b/target/linux/ramips/dts/MZK-DP150N.dts index 7fa8ef4ab909..2e559d6c7e12 100644 --- a/target/linux/ramips/dts/MZK-DP150N.dts +++ b/target/linux/ramips/dts/MZK-DP150N.dts @@ -43,7 +43,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MZK-EX300NP.dts b/target/linux/ramips/dts/MZK-EX300NP.dts index 569d0a951cbe..854d8a141b19 100644 --- a/target/linux/ramips/dts/MZK-EX300NP.dts +++ b/target/linux/ramips/dts/MZK-EX300NP.dts @@ -78,7 +78,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MZK-EX750NP.dts b/target/linux/ramips/dts/MZK-EX750NP.dts index 858a8fe23fae..29a11898e8df 100644 --- a/target/linux/ramips/dts/MZK-EX750NP.dts +++ b/target/linux/ramips/dts/MZK-EX750NP.dts @@ -83,7 +83,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/MicroWRT.dts b/target/linux/ramips/dts/MicroWRT.dts index c8558c6326ef..6f8179cc5762 100644 --- a/target/linux/ramips/dts/MicroWRT.dts +++ b/target/linux/ramips/dts/MicroWRT.dts @@ -48,7 +48,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/NBG-419N2.dts b/target/linux/ramips/dts/NBG-419N2.dts index 8bb0cc5280c0..18e7902397ad 100644 --- a/target/linux/ramips/dts/NBG-419N2.dts +++ b/target/linux/ramips/dts/NBG-419N2.dts @@ -14,9 +14,8 @@ 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>; partition@0 { diff --git a/target/linux/ramips/dts/NCS601W.dts b/target/linux/ramips/dts/NCS601W.dts index 1942b0f9086b..3c5097f5590f 100644 --- a/target/linux/ramips/dts/NCS601W.dts +++ b/target/linux/ramips/dts/NCS601W.dts @@ -15,7 +15,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/NIXCORE-16M.dts b/target/linux/ramips/dts/NIXCORE-16M.dts index b97c425364fd..5d4cdae7f935 100644 --- a/target/linux/ramips/dts/NIXCORE-16M.dts +++ b/target/linux/ramips/dts/NIXCORE-16M.dts @@ -14,7 +14,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/NIXCORE-8M.dts b/target/linux/ramips/dts/NIXCORE-8M.dts index 55457d9ddebb..af78808bd722 100644 --- a/target/linux/ramips/dts/NIXCORE-8M.dts +++ b/target/linux/ramips/dts/NIXCORE-8M.dts @@ -14,7 +14,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/NW718.dts b/target/linux/ramips/dts/NW718.dts index 372bff6e7f29..60922555d678 100644 --- a/target/linux/ramips/dts/NW718.dts +++ b/target/linux/ramips/dts/NW718.dts @@ -55,7 +55,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <25000000>; partition@0 { diff --git a/target/linux/ramips/dts/OY-0001.dts b/target/linux/ramips/dts/OY-0001.dts index 932d379b700c..ff6fe1e2e220 100644 --- a/target/linux/ramips/dts/OY-0001.dts +++ b/target/linux/ramips/dts/OY-0001.dts @@ -56,7 +56,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/PBR-D1.dts b/target/linux/ramips/dts/PBR-D1.dts index 3d4e987c4852..739940efbcb2 100644 --- a/target/linux/ramips/dts/PBR-D1.dts +++ b/target/linux/ramips/dts/PBR-D1.dts @@ -99,7 +99,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <40000000>; m25p,chunked-io = <31>; diff --git a/target/linux/ramips/dts/PSG1208.dts b/target/linux/ramips/dts/PSG1208.dts index 6227bda9513c..547da2fdfa73 100644 --- a/target/linux/ramips/dts/PSG1208.dts +++ b/target/linux/ramips/dts/PSG1208.dts @@ -52,7 +52,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/PSG1218.dts b/target/linux/ramips/dts/PSG1218.dts index 38ad25e99833..1e53dcef3d07 100644 --- a/target/linux/ramips/dts/PSG1218.dts +++ b/target/linux/ramips/dts/PSG1218.dts @@ -53,7 +53,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/PX-4885-4M.dts b/target/linux/ramips/dts/PX-4885-4M.dts index 398a4a90dca0..bd3b271925d7 100644 --- a/target/linux/ramips/dts/PX-4885-4M.dts +++ b/target/linux/ramips/dts/PX-4885-4M.dts @@ -14,7 +14,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/PX-4885-8M.dts b/target/linux/ramips/dts/PX-4885-8M.dts index d6e694ed58e3..605540928e43 100644 --- a/target/linux/ramips/dts/PX-4885-8M.dts +++ b/target/linux/ramips/dts/PX-4885-8M.dts @@ -14,7 +14,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/RP-N53.dts b/target/linux/ramips/dts/RP-N53.dts index 514481b38218..8e9b1361c95b 100644 --- a/target/linux/ramips/dts/RP-N53.dts +++ b/target/linux/ramips/dts/RP-N53.dts @@ -106,7 +106,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/RT-G32-B1.dts b/target/linux/ramips/dts/RT-G32-B1.dts index d392bb3545aa..38d6992f0cd1 100644 --- a/target/linux/ramips/dts/RT-G32-B1.dts +++ b/target/linux/ramips/dts/RT-G32-B1.dts @@ -36,7 +36,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/RT-N14U.dts b/target/linux/ramips/dts/RT-N14U.dts index 22dd7b818b94..8bb2701040bc 100644 --- a/target/linux/ramips/dts/RT-N14U.dts +++ b/target/linux/ramips/dts/RT-N14U.dts @@ -73,7 +73,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts b/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts index bda918b44bca..dbd2cf6ad449 100644 --- a/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts +++ b/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts @@ -37,7 +37,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO.dts b/target/linux/ramips/dts/RT5350F-OLINUXINO.dts index 0d28e10d9503..a4f1aa74559f 100644 --- a/target/linux/ramips/dts/RT5350F-OLINUXINO.dts +++ b/target/linux/ramips/dts/RT5350F-OLINUXINO.dts @@ -15,7 +15,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/RUT5XX.dts b/target/linux/ramips/dts/RUT5XX.dts index 76cf49bab2fe..7a09d4312516 100644 --- a/target/linux/ramips/dts/RUT5XX.dts +++ b/target/linux/ramips/dts/RUT5XX.dts @@ -39,7 +39,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "n25q128a13"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/TEW-714TRU.dts b/target/linux/ramips/dts/TEW-714TRU.dts index 79b30d1bfdca..27727cb8814e 100644 --- a/target/linux/ramips/dts/TEW-714TRU.dts +++ b/target/linux/ramips/dts/TEW-714TRU.dts @@ -65,7 +65,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/TINY-AC.dts b/target/linux/ramips/dts/TINY-AC.dts index 356c44d5118d..460227db101e 100644 --- a/target/linux/ramips/dts/TINY-AC.dts +++ b/target/linux/ramips/dts/TINY-AC.dts @@ -73,7 +73,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/VOCORE-16M.dts b/target/linux/ramips/dts/VOCORE-16M.dts index dd10784bf15d..d2792c4b8c81 100644 --- a/target/linux/ramips/dts/VOCORE-16M.dts +++ b/target/linux/ramips/dts/VOCORE-16M.dts @@ -14,7 +14,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/VOCORE-8M.dts b/target/linux/ramips/dts/VOCORE-8M.dts index e3647244f9f0..ea14a420a56f 100644 --- a/target/linux/ramips/dts/VOCORE-8M.dts +++ b/target/linux/ramips/dts/VOCORE-8M.dts @@ -14,7 +14,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/WHR-1166D.dts index 69282d8fd26c..1f200cd68919 100644 --- a/target/linux/ramips/dts/WHR-1166D.dts +++ b/target/linux/ramips/dts/WHR-1166D.dts @@ -93,7 +93,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/WHR-300HP2.dts index 395821708274..44387541b118 100644 --- a/target/linux/ramips/dts/WHR-300HP2.dts +++ b/target/linux/ramips/dts/WHR-300HP2.dts @@ -93,7 +93,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts index bea67a9a9019..9370d15bbf91 100644 --- a/target/linux/ramips/dts/WHR-600D.dts +++ b/target/linux/ramips/dts/WHR-600D.dts @@ -93,7 +93,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l6405d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WIDORA-NEO.dts b/target/linux/ramips/dts/WIDORA-NEO.dts index f6b8f1d52c13..0be11e9a8ea5 100644 --- a/target/linux/ramips/dts/WIDORA-NEO.dts +++ b/target/linux/ramips/dts/WIDORA-NEO.dts @@ -105,7 +105,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <40000000>; m25p,chunked-io = <31>; diff --git a/target/linux/ramips/dts/WIZARD8800.dts b/target/linux/ramips/dts/WIZARD8800.dts index bbfa61085d2b..623e351104e3 100644 --- a/target/linux/ramips/dts/WIZARD8800.dts +++ b/target/linux/ramips/dts/WIZARD8800.dts @@ -23,7 +23,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q32"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts index 78891c24b6d4..9f1956496912 100644 --- a/target/linux/ramips/dts/WIZFI630A.dts +++ b/target/linux/ramips/dts/WIZFI630A.dts @@ -85,7 +85,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WL-330N.dts b/target/linux/ramips/dts/WL-330N.dts index 1cf1712dfa1f..3095e245107b 100644 --- a/target/linux/ramips/dts/WL-330N.dts +++ b/target/linux/ramips/dts/WL-330N.dts @@ -50,7 +50,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WL-330N3G.dts b/target/linux/ramips/dts/WL-330N3G.dts index fe703ba5b3fd..948d37dc9898 100644 --- a/target/linux/ramips/dts/WL-330N3G.dts +++ b/target/linux/ramips/dts/WL-330N3G.dts @@ -55,7 +55,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WL-WN575A3.dts b/target/linux/ramips/dts/WL-WN575A3.dts index 2deadd3a9573..98716beb496c 100644 --- a/target/linux/ramips/dts/WL-WN575A3.dts +++ b/target/linux/ramips/dts/WL-WN575A3.dts @@ -90,7 +90,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; m25p,chunked-io = <32>; diff --git a/target/linux/ramips/dts/WMR-300.dts b/target/linux/ramips/dts/WMR-300.dts index faa867b723d4..a56f71642e7c 100644 --- a/target/linux/ramips/dts/WMR-300.dts +++ b/target/linux/ramips/dts/WMR-300.dts @@ -59,7 +59,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WNCE2001.dts b/target/linux/ramips/dts/WNCE2001.dts index 92d03defdce3..fd529660070f 100644 --- a/target/linux/ramips/dts/WNCE2001.dts +++ b/target/linux/ramips/dts/WNCE2001.dts @@ -76,7 +76,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l3205d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WRH-300CR.dts b/target/linux/ramips/dts/WRH-300CR.dts index f7ef9335f1cf..c336ba317a22 100644 --- a/target/linux/ramips/dts/WRH-300CR.dts +++ b/target/linux/ramips/dts/WRH-300CR.dts @@ -67,7 +67,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "mx25l12805d"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WRTNODE.dts b/target/linux/ramips/dts/WRTNODE.dts index 04f5836d0a9e..df10eefcbfd8 100644 --- a/target/linux/ramips/dts/WRTNODE.dts +++ b/target/linux/ramips/dts/WRTNODE.dts @@ -36,7 +36,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WT1520-4M.dts b/target/linux/ramips/dts/WT1520-4M.dts index 26e01f1043e1..7db82428fca2 100644 --- a/target/linux/ramips/dts/WT1520-4M.dts +++ b/target/linux/ramips/dts/WT1520-4M.dts @@ -14,7 +14,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WT1520-8M.dts b/target/linux/ramips/dts/WT1520-8M.dts index 86c92979700e..101f3d7c9191 100644 --- a/target/linux/ramips/dts/WT1520-8M.dts +++ b/target/linux/ramips/dts/WT1520-8M.dts @@ -14,7 +14,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WT3020-4M.dts b/target/linux/ramips/dts/WT3020-4M.dts index 6e40d5a86941..c2d83f9fabca 100644 --- a/target/linux/ramips/dts/WT3020-4M.dts +++ b/target/linux/ramips/dts/WT3020-4M.dts @@ -47,7 +47,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q32"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/WT3020-8M.dts b/target/linux/ramips/dts/WT3020-8M.dts index 4ef48cb14efe..987eed4ee541 100644 --- a/target/linux/ramips/dts/WT3020-8M.dts +++ b/target/linux/ramips/dts/WT3020-8M.dts @@ -47,7 +47,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/X5.dts b/target/linux/ramips/dts/X5.dts index efb9d77d7102..9cae72c8fb7f 100644 --- a/target/linux/ramips/dts/X5.dts +++ b/target/linux/ramips/dts/X5.dts @@ -78,7 +78,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "gd25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/X8.dts b/target/linux/ramips/dts/X8.dts index db8eec56c5a1..de5170e2adb5 100644 --- a/target/linux/ramips/dts/X8.dts +++ b/target/linux/ramips/dts/X8.dts @@ -39,7 +39,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "gd25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/Y1.dtsi b/target/linux/ramips/dts/Y1.dtsi index 0d0623bbe885..0ac04c43c168 100644 --- a/target/linux/ramips/dts/Y1.dtsi +++ b/target/linux/ramips/dts/Y1.dtsi @@ -41,7 +41,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q128"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/YOUKU-YK1.dts b/target/linux/ramips/dts/YOUKU-YK1.dts index 1746f6c674ac..260f86ab96ef 100644 --- a/target/linux/ramips/dts/YOUKU-YK1.dts +++ b/target/linux/ramips/dts/YOUKU-YK1.dts @@ -65,7 +65,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q256"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ZBT-APE522II.dts b/target/linux/ramips/dts/ZBT-APE522II.dts index 2213ca9cca6d..9a8b700a50cc 100644 --- a/target/linux/ramips/dts/ZBT-APE522II.dts +++ b/target/linux/ramips/dts/ZBT-APE522II.dts @@ -79,7 +79,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "w25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ZBT-CPE102.dts b/target/linux/ramips/dts/ZBT-CPE102.dts index abfe0c0229ea..089084077dd4 100644 --- a/target/linux/ramips/dts/ZBT-CPE102.dts +++ b/target/linux/ramips/dts/ZBT-CPE102.dts @@ -65,7 +65,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ZBT-WA05.dts b/target/linux/ramips/dts/ZBT-WA05.dts index 43f08f51390e..33538892c3bd 100644 --- a/target/linux/ramips/dts/ZBT-WA05.dts +++ b/target/linux/ramips/dts/ZBT-WA05.dts @@ -65,7 +65,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ZBT-WE826.dts b/target/linux/ramips/dts/ZBT-WE826.dts index 1eb03189d1fe..de7fa42d91ad 100644 --- a/target/linux/ramips/dts/ZBT-WE826.dts +++ b/target/linux/ramips/dts/ZBT-WE826.dts @@ -59,9 +59,8 @@ en25q128@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "w25q128"; + compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ZBT-WR8305RT.dts b/target/linux/ramips/dts/ZBT-WR8305RT.dts index edc820f790ff..81598bd237dd 100644 --- a/target/linux/ramips/dts/ZBT-WR8305RT.dts +++ b/target/linux/ramips/dts/ZBT-WR8305RT.dts @@ -57,7 +57,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; partition@0 { diff --git a/target/linux/ramips/dts/ZTE-Q7.dts b/target/linux/ramips/dts/ZTE-Q7.dts index 44bed871aa50..9ec1d89a4153 100644 --- a/target/linux/ramips/dts/ZTE-Q7.dts +++ b/target/linux/ramips/dts/ZTE-Q7.dts @@ -52,7 +52,6 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; - linux,modalias = "m25p80", "en25q64"; spi-max-frequency = <10000000>; partition@0 { -- 2.30.2