diff mbox

[1/3] mtd: nand: add Macronix manufacturer

Message ID 1320266084-18131-1-git-send-email-computersforpeace@gmail.com
State Accepted
Commit c1257b4798d48b73ad1a9ca359504cd49caefa0d
Headers show

Commit Message

Brian Norris Nov. 2, 2011, 8:34 p.m. UTC
Macronix is produing SLC NAND MX30LF1208AA, so add their manufacturer
code to the manufacturer lists.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 drivers/mtd/nand/nand_ids.c |    1 +
 include/linux/mtd/nand.h    |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

Comments

Artem Bityutskiy Nov. 8, 2011, 9:13 p.m. UTC | #1
On Wed, 2011-11-02 at 13:34 -0700, Brian Norris wrote:
> Macronix is produing SLC NAND MX30LF1208AA, so add their manufacturer
> code to the manufacturer lists.
> 
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>

Pushed all 3 patches to l2-mtd-2.6.git, thanks!

Artem.
diff mbox

Patch

diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 00cf1b0..56c688d 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -176,6 +176,7 @@  struct nand_manufacturers nand_manuf_ids[] = {
 	{NAND_MFR_HYNIX, "Hynix"},
 	{NAND_MFR_MICRON, "Micron"},
 	{NAND_MFR_AMD, "AMD"},
+	{NAND_MFR_MACRONIX, "Macronix"},
 	{0x0, "Unknown"}
 };
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 904131b..63b5a8b 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -555,6 +555,7 @@  struct nand_chip {
 #define NAND_MFR_HYNIX		0xad
 #define NAND_MFR_MICRON		0x2c
 #define NAND_MFR_AMD		0x01
+#define NAND_MFR_MACRONIX	0xc2
 
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure