aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Shijie <b32955@freescale.com>2014-01-03 03:50:39 -0500
committerBrian Norris <computersforpeace@gmail.com>2014-01-20 14:30:52 -0500
commit4968a4124cf2df4b3672eed4714c6755f10f400c (patch)
tree85ce23e6d7e9c83895a23623ba2a5810a7a710b9
parent3f97c6ff6de8a657e4d4d826e502698004cfc2ae (diff)
mtd: nand: add Intel manufacturer ID
Add the Intel manufacturer Id. Tested with Intel JS29F32G08ACMD1(4096 + 224) which is ONFI 2.0 compliant nand. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-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 136a46321c6f..daa2faacd7d0 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -170,6 +170,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
170 {NAND_MFR_MACRONIX, "Macronix"}, 170 {NAND_MFR_MACRONIX, "Macronix"},
171 {NAND_MFR_EON, "Eon"}, 171 {NAND_MFR_EON, "Eon"},
172 {NAND_MFR_SANDISK, "SanDisk"}, 172 {NAND_MFR_SANDISK, "SanDisk"},
173 {NAND_MFR_INTEL, "Intel"},
173 {0x0, "Unknown"} 174 {0x0, "Unknown"}
174}; 175};
175 176
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index e03a78c70de1..32f8612469d8 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -634,6 +634,7 @@ struct nand_chip {
634#define NAND_MFR_MACRONIX 0xc2 634#define NAND_MFR_MACRONIX 0xc2
635#define NAND_MFR_EON 0x92 635#define NAND_MFR_EON 0x92
636#define NAND_MFR_SANDISK 0x45 636#define NAND_MFR_SANDISK 0x45
637#define NAND_MFR_INTEL 0x89
637 638
638/* The maximum expected count of bytes in the NAND ID sequence */ 639/* The maximum expected count of bytes in the NAND ID sequence */
639#define NAND_MAX_ID_LEN 8 640#define NAND_MAX_ID_LEN 8