[PATCH] mtd: update NAND manufacturer names from the kernel

[Jan Luebbe]

Signed-off-by: Jan Luebbe <jlu at pengutronix.de>
---
 drivers/mtd/nand/nand_ids.c |  4 +++-
 include/linux/mtd/nand.h    | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 72593d4..4f8fb02 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -178,7 +178,9 @@ struct nand_manufacturers nand_manuf_ids[] = {
 	{NAND_MFR_STMICRO, __NANDSTR("ST Micro")},
 	{NAND_MFR_HYNIX, __NANDSTR("Hynix")},
 	{NAND_MFR_MICRON, __NANDSTR("Micron")},
-	{NAND_MFR_AMD, __NANDSTR("AMD")},
+	{NAND_MFR_AMD, __NANDSTR("AMD/Spansion")},
+	{NAND_MFR_MACRONIX, __NANDSTR("Macronix")},
+	{NAND_MFR_EON, __NANDSTR("Eon")},
 	{0x0, "Unknown"}
 };
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index d2f8648..1df1a7b 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -497,15 +497,17 @@ struct nand_chip {
 /*
  * NAND Flash Manufacturer ID Codes
  */
-#define NAND_MFR_TOSHIBA	0x98
-#define NAND_MFR_SAMSUNG	0xec
-#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_TOSHIBA        0x98
+#define NAND_MFR_SAMSUNG        0xec
+#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_MACRONIX       0xc2
+#define NAND_MFR_EON            0x92
 
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure
-- 
1.8.2.rc2