mtd: m25p80: remove unused flash entries from id_table

We had many entries that were recently added just to allow selecting
some flashes directly but were never used. They weren't providing any
special flash handling, we just needed them due to the lack of some
generic binding string.

With the introduction of "nor-jedec" (in 1103b85) they won't be needed
unless we discover some faulty flash requiring workarounds.
As explained in m25p80 DT documentation we require specifying
"nor-jedec" now as less specific compatible entry.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7c8b1694a134da91cbeb5b4764922c8e7d8d06c2..052bd19505754cef30a59f0be4e2d12a9b792c92 100644 (file)
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -261,45 +261,33 @@ static int m25p_remove(struct spi_device *spi)
  * keep them available as module aliases for existing platforms.
  */
 static const struct spi_device_id m25p_ids[] = {
-       {"at25fs010"},  {"at25fs040"},  {"at25df041a"}, {"at25df321a"},
-       {"at25df641"},  {"at26f004"},   {"at26df081a"}, {"at26df161a"},
-       {"at26df321"},  {"at45db081d"},
-       {"en25f32"},    {"en25p32"},    {"en25q32b"},   {"en25p64"},
-       {"en25q64"},    {"en25qh128"},  {"en25qh256"},
-       {"f25l32pa"},
-       {"mr25h256"},   {"mr25h10"},
-       {"gd25q32"},    {"gd25q64"},
-       {"160s33b"},    {"320s33b"},    {"640s33b"},
-       {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"},  {"mx25l1606e"},
-       {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"},
-       {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"},
-       {"mx66l1g55g"},
-       {"n25q064"},    {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"},
-       {"n25q512a"},   {"n25q512ax3"}, {"n25q00"},
-       {"pm25lv512"},  {"pm25lv010"},  {"pm25lq032"},
-       {"s25sl032p"},  {"s25sl064p"},  {"s25fl256s0"}, {"s25fl256s1"},
-       {"s25fl512s"},  {"s70fl01gs"},  {"s25sl12800"}, {"s25sl12801"},
-       {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"},  {"s25sl008a"},
-       {"s25sl016a"},  {"s25sl032a"},  {"s25sl064a"},  {"s25fl008k"},
-       {"s25fl016k"},  {"s25fl064k"},  {"s25fl132k"},
-       {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"},
-       {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"},
-       {"sst25wf040"},
-       {"m25p05"},     {"m25p10"},     {"m25p20"},     {"m25p40"},
-       {"m25p80"},     {"m25p16"},     {"m25p32"},     {"m25p64"},
-       {"m25p128"},    {"n25q032"},
+       /*
+        * Entries not used in DTs that should be safe to drop after replacing
+        * them with "nor-jedec" in platform data.
+        */
+       {"s25sl064a"},  {"w25x16"},     {"m25p10"},     {"m25px64"},
+
+       /*
+        * Entries that were used in DTs without "nor-jedec" fallback and should
+        * be kept for backward compatibility.
+        */
+       {"at25df321a"}, {"at25df641"},  {"at26df081a"},
+       {"mr25h256"},
+       {"mx25l4005a"}, {"mx25l1606e"}, {"mx25l6405d"}, {"mx25l12805d"},
+       {"mx25l25635e"},{"mx66l51235l"},
+       {"n25q064"},    {"n25q128a11"}, {"n25q128a13"}, {"n25q512a"},
+       {"s25fl256s1"}, {"s25fl512s"},  {"s25sl12801"}, {"s25fl008k"},
+       {"s25fl064k"},
+       {"sst25vf040b"},{"sst25vf016b"},{"sst25vf032b"},{"sst25wf040"},
+       {"m25p40"},     {"m25p80"},     {"m25p16"},     {"m25p32"},
+       {"m25p64"},     {"m25p128"},
+       {"w25x80"},     {"w25x32"},     {"w25q32"},     {"w25q32dw"},
+       {"w25q80bl"},   {"w25q128"},    {"w25q256"},
+
+       /* Flashes that can't be detected using JEDEC */
        {"m25p05-nonjedec"},    {"m25p10-nonjedec"},    {"m25p20-nonjedec"},
        {"m25p40-nonjedec"},    {"m25p80-nonjedec"},    {"m25p16-nonjedec"},
        {"m25p32-nonjedec"},    {"m25p64-nonjedec"},    {"m25p128-nonjedec"},
-       {"m45pe10"},    {"m45pe80"},    {"m45pe16"},
-       {"m25pe20"},    {"m25pe80"},    {"m25pe16"},
-       {"m25px16"},    {"m25px32"},    {"m25px32-s0"}, {"m25px32-s1"},
-       {"m25px64"},    {"m25px80"},
-       {"w25x10"},     {"w25x20"},     {"w25x40"},     {"w25x80"},
-       {"w25x16"},     {"w25x32"},     {"w25q32"},     {"w25q32dw"},
-       {"w25x64"},     {"w25q64"},     {"w25q80"},     {"w25q80bl"},
-       {"w25q128"},    {"w25q256"},    {"cat25c11"},
-       {"cat25c03"},   {"cat25c09"},   {"cat25c17"},   {"cat25128"},
 
        /*
         * Generic support for SPI NOR that can be identified by the JEDEC READ