]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mtd: nand: add Macronix manufacturer
authorBrian Norris <computersforpeace@gmail.com>
Wed, 2 Nov 2011 20:34:42 +0000 (13:34 -0700)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 9 Jan 2012 17:59:33 +0000 (17:59 +0000)
Macronix is produing SLC NAND MX30LF1208AA, so add their manufacturer
code to the manufacturer lists.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/nand_ids.c
include/linux/mtd/nand.h

index 00cf1b0d60531a2699382fbdd5651ae11e956683..56c688dafe9269796e686164e8d9cf17e1bf60f0 100644 (file)
@@ -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"}
 };
 
index 904131bab501380e9a82dbfdafa412609531b7f1..63b5a8b6dfbda263525aada5aeee309b312b2620 100644 (file)
@@ -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