aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsshahrom@micron.com <sshahrom@micron.com>2007-03-21 18:48:02 -0700
committerDavid Woodhouse <dwmw2@infradead.org>2007-04-17 18:27:06 +0100
commit8c60e5475d8ca614d712cd3e2fe7330480709e02 (patch)
treeb0039cd0008277f532dbe462f6bb33877ceae77d
parent[JFFS2] check node crc before doing anything else (diff)
downloadlinux-dev-8c60e5475d8ca614d712cd3e2fe7330480709e02.tar.xz
linux-dev-8c60e5475d8ca614d712cd3e2fe7330480709e02.zip
[MTD][NAND] Add Micron Manufacturer ID
Add Micron Manufacturer ID. Signed-off-by: Shahrom Sharif <sshahrom@micron.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--drivers/mtd/nand/nand_ids.c1
-rw-r--r--include/linux/mtd/nand.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 2e2cdf2fc91d..900207769167 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -137,6 +137,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
{NAND_MFR_RENESAS, "Renesas"},
{NAND_MFR_STMICRO, "ST Micro"},
{NAND_MFR_HYNIX, "Hynix"},
+ {NAND_MFR_MICRON, "Micron"},
{0x0, "Unknown"}
};
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 97523887fe5d..cf197ad62da6 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -431,6 +431,7 @@ struct nand_chip {
#define NAND_MFR_RENESAS 0x07
#define NAND_MFR_STMICRO 0x20
#define NAND_MFR_HYNIX 0xad
+#define NAND_MFR_MICRON 0x2c
/**
* struct nand_flash_dev - NAND Flash Device ID Structure