summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf@atmel.com>2007-05-24 12:12:47 +0200
committerStefan Roese <sr@denx.de>2007-05-24 12:12:47 +0200
commit7ebb4479b07ff294eb4d76e420753a0349f7c93b (patch)
tree46f043f68e4cddb959dc384aa45c46332d455d52
parent70124c2602ae2d4c5d3dba05b482d91548242de8 (diff)
[PATCH][NAND] Define the Vendor Id for Micron NAND Flash
Signed-off-by: Ulf Samuelsson <ulf@atmel.com> Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--drivers/nand/nand_ids.c1
-rw-r--r--include/linux/mtd/nand.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nand/nand_ids.c b/drivers/nand/nand_ids.c
index 8b58736bc1..70fdfd3f50 100644
--- a/drivers/nand/nand_ids.c
+++ b/drivers/nand/nand_ids.c
@@ -123,6 +123,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
{NAND_MFR_NATIONAL, "National"},
{NAND_MFR_RENESAS, "Renesas"},
{NAND_MFR_STMICRO, "ST Micro"},
+ {NAND_MFR_MICRON, "Micron"},
{0x0, "Unknown"}
};
#endif
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 4b485643a1..49ff80fd3a 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -348,6 +348,7 @@ struct nand_chip {
#define NAND_MFR_NATIONAL 0x8f
#define NAND_MFR_RENESAS 0x07
#define NAND_MFR_STMICRO 0x20
+#define NAND_MFR_MICRON 0x2c
/**
* struct nand_flash_dev - NAND Flash Device ID Structure