[PATCH 4/5] mtd: nand: Update NAND manufacturer Ids

[Benedikt Spranger]

Align manufacturer Ids with the Id list from Linux kernel v6.11.
While at it, sort the entries in alphabetical order.

Signed-off-by: Benedikt Spranger <b.spran...@linutronix.de>
Reviewed-by: John Ogness <john.ogn...@linutronix.de>
---
 drivers/mtd/nand/raw/nand_ids.c | 22 ++++++++++++----------
 include/linux/mtd/rawnand.h     | 23 +++++++++++++----------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c
index 4f46378ffe1..e40facf774c 100644
--- a/drivers/mtd/nand/raw/nand_ids.c
+++ b/drivers/mtd/nand/raw/nand_ids.c
@@ -180,20 +180,22 @@ struct nand_flash_dev nand_flash_ids[] = {
 
 /* Manufacturer IDs */
 struct nand_manufacturer nand_manuf_ids[] = {
-       {NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops},
-       {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},
+       {NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops},
+       {NAND_MFR_ATO, "ATO"},
+       {NAND_MFR_EON, "Eon"},
+       {NAND_MFR_EON, "ESMT"},
        {NAND_MFR_FUJITSU, "Fujitsu"},
-       {NAND_MFR_NATIONAL, "National"},
-       {NAND_MFR_RENESAS, "Renesas"},
-       {NAND_MFR_STMICRO, "ST Micro"},
        {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops},
-       {NAND_MFR_MICRON, "Micron", &micron_nand_manuf_ops},
-       {NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops},
+       {NAND_MFR_INTEL, "Intel"},
        {NAND_MFR_MACRONIX, "Macronix", &macronix_nand_manuf_ops},
-       {NAND_MFR_EON, "Eon"},
+       {NAND_MFR_MICRON, "Micron", &micron_nand_manuf_ops},
+       {NAND_MFR_NATIONAL, "National"},
+       {NAND_MFR_RENESAS, "Renesas"},
+       {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},
        {NAND_MFR_SANDISK, "SanDisk"},
-       {NAND_MFR_INTEL, "Intel"},
-       {NAND_MFR_ATO, "ATO"},
+       {NAND_MFR_STMICRO, "ST Micro"},
+       {NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops},
+       {NAND_MFR_WINBOND, "Winbond"},
        {0x0, "Unknown"}
 };
 
diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
index 537c62424a1..eaa6ec84b07 100644
--- a/include/linux/mtd/rawnand.h
+++ b/include/linux/mtd/rawnand.h
@@ -1030,20 +1030,23 @@ static inline void *nand_get_manufacturer_data(struct 
nand_chip *chip)
 /*
  * NAND Flash Manufacturer ID Codes
  */
-#define NAND_MFR_TOSHIBA       0x98
-#define NAND_MFR_SAMSUNG       0xec
+#define NAND_MFR_AMD           0x01
+#define NAND_MFR_ATO           0x9b
+#define NAND_MFR_EON           0x92
+#define NAND_MFR_ESMT          0xc8
 #define NAND_MFR_FUJITSU       0x04
-#define NAND_MFR_NATIONAL      0x8f
-#define NAND_MFR_RENESAS       0x07
-#define NAND_MFR_STMICRO       0x20
 #define NAND_MFR_HYNIX         0xad
-#define NAND_MFR_MICRON                0x2c
-#define NAND_MFR_AMD           0x01
+#define NAND_MFR_INTEL         0x89
 #define NAND_MFR_MACRONIX      0xc2
-#define NAND_MFR_EON           0x92
+#define NAND_MFR_MICRON                0x2c
+#define NAND_MFR_NATIONAL      0x8f
+#define NAND_MFR_RENESAS       0x07
+#define NAND_MFR_SAMSUNG       0xec
 #define NAND_MFR_SANDISK       0x45
-#define NAND_MFR_INTEL         0x89
-#define NAND_MFR_ATO           0x9b
+#define NAND_MFR_STMICRO       0x20
+/* Kioxia is new name of Toshiba memory. */
+#define NAND_MFR_TOSHIBA       0x98
+#define NAND_MFR_WINBOND       0xef
 
 /* The maximum expected count of bytes in the NAND ID sequence */
 #define NAND_MAX_ID_LEN 8
-- 
2.45.2