From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qy0-f177.google.com ([209.85.216.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RLhWs-0004bV-RG for linux-mtd@lists.infradead.org; Wed, 02 Nov 2011 20:35:23 +0000 Received: by qyk10 with SMTP id 10so624339qyk.15 for ; Wed, 02 Nov 2011 13:35:21 -0700 (PDT) From: Brian Norris To: Artem Bityutskiy Subject: [PATCH 3/3] mtd: nand: scan 1st and 2nd page for Macronix SLC Date: Wed, 2 Nov 2011 13:34:44 -0700 Message-Id: <1320266084-18131-3-git-send-email-computersforpeace@gmail.com> In-Reply-To: <1320266084-18131-1-git-send-email-computersforpeace@gmail.com> References: <1320266084-18131-1-git-send-email-computersforpeace@gmail.com> Cc: Kevin Cernekee , Brian Norris , linux-mtd@lists.infradead.org, David Woodhouse List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Brian Norris --- drivers/mtd/nand/nand_base.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 3ed9c5e..35b4565 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3132,8 +3132,8 @@ ident_done: * Bad block marker is stored in the last page of each block * on Samsung and Hynix MLC devices; stored in first two pages * of each block on Micron devices with 2KiB pages and on - * SLC Samsung, Hynix, Toshiba and AMD/Spansion. All others scan - * only the first page. + * SLC Samsung, Hynix, Toshiba, AMD/Spansion, and Macronix. + * All others scan only the first page. */ if ((chip->cellinfo & NAND_CI_CELLTYPE_MSK) && (*maf_id == NAND_MFR_SAMSUNG || @@ -3143,7 +3143,8 @@ ident_done: (*maf_id == NAND_MFR_SAMSUNG || *maf_id == NAND_MFR_HYNIX || *maf_id == NAND_MFR_TOSHIBA || - *maf_id == NAND_MFR_AMD)) || + *maf_id == NAND_MFR_AMD || + *maf_id == NAND_MFR_MACRONIX)) || (mtd->writesize == 2048 && *maf_id == NAND_MFR_MICRON)) chip->bbt_options |= NAND_BBT_SCAN2NDPAGE; -- 1.7.5.4