commit a11a23eb40db0fb492c203e17d05d7fa5cc4cdfa
author Vladimir Abram <vladabr@marvell.com> Tue Mar 05 17:33:37 2013 +0200
committer Ed James <edjames@google.com> Wed Sep 09 11:54:33 2015 -0700
tree b0119de85a727a64518c2f0efb7afd900c1125f0
parent a319a122dbb7ac3ccc3102eeba62d9e703ded3a2

nand: fixed support for Micron 4GB 8K page NAND flash

    Added Micron 4GB 8K page 8-bit BCH ECC NAND flash device.
    * fixed previous commit: Micron 8K page flash was added to function
      nand_get_flash_type().

Change-Id: Id338b28f5d292c1d58f1c5271170e87a4451da22
Signed-off-by: Vladimir Abram <vladabr@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/15775
Reviewed-by: Omri Itach <omrii@marvell.com>
Tested-by: Omri Itach <omrii@marvell.com>

drivers/mtd/nand/nand_base.c

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index c4e7584..adc837e 100755
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2920,8 +2920,8 @@
 				 *maf_id == NAND_MFR_HYNIX ||
 				 *maf_id == NAND_MFR_TOSHIBA ||
 				 *maf_id == NAND_MFR_AMD)) ||
-			(mtd->writesize == 2048 &&
-			 *maf_id == NAND_MFR_MICRON))
+			 (*maf_id == NAND_MFR_MICRON &&
+			 (mtd->writesize == 2048 || mtd->writesize == 8192)))
 		chip->options |= NAND_BBT_SCAN2NDPAGE;
 
 	/*