3 files changed, 11 insertions, 8 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index bb2e24b2d6c4..3a9a8fc6a36c 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -344,7 +344,7 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
         struct nand_chip *chip = mtd->priv;
         u16 bad;
 
-        if (chip->options & NAND_BBT_SCANLASTPAGE)
+        if (chip->bbt_options & NAND_BBT_SCANLASTPAGE)
                 ofs += mtd->erasesize - mtd->writesize;
 
         page = (int)(ofs >> chip->page_shift) & chip->pagemask;
@@ -396,7 +396,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
         uint8_t buf[2] = { 0, 0 };
         int block, ret, i = 0;
 
-        if (chip->options & NAND_BBT_SCANLASTPAGE)
+        if (chip->bbt_options & NAND_BBT_SCANLASTPAGE)
                 ofs += mtd->erasesize - mtd->writesize;
 
         /* Get block number */
@@ -426,7 +426,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
 
                         i++;
                         ofs += mtd->writesize;
-                } while (!ret && (chip->options & NAND_BBT_SCAN2NDPAGE) &&
+                } while (!ret && (chip->bbt_options & NAND_BBT_SCAN2NDPAGE) &&
                                 i < 2);
 
                 nand_release_device(mtd);
@@ -3117,7 +3117,7 @@ ident_done:
         if ((chip->cellinfo & NAND_CI_CELLTYPE_MSK) &&
                         (*maf_id == NAND_MFR_SAMSUNG ||
                          *maf_id == NAND_MFR_HYNIX))
-                chip->options |= NAND_BBT_SCANLASTPAGE;
+                chip->bbt_options |= NAND_BBT_SCANLASTPAGE;
         else if ((!(chip->cellinfo & NAND_CI_CELLTYPE_MSK) &&
                                 (*maf_id == NAND_MFR_SAMSUNG ||
                                  *maf_id == NAND_MFR_HYNIX ||
@@ -3125,7 +3125,7 @@ ident_done:
                                  *maf_id == NAND_MFR_AMD)) ||
                         (mtd->writesize == 2048 &&
                          *maf_id == NAND_MFR_MICRON))
-                chip->options |= NAND_BBT_SCAN2NDPAGE;
+                chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
 
         /* Check for AND chips with 4 page planes */
         if (chip->options & NAND_4PAGE_ARRAY)
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 5ffb9a4632ca..5df01d8efd92 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -517,7 +517,7 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf,
                 from = (loff_t)startblock << (this->bbt_erase_shift - 1);
         }
 
-        if (this->options & NAND_BBT_SCANLASTPAGE)
+        if (this->bbt_options & NAND_BBT_SCANLASTPAGE)
                 from += mtd->erasesize - (mtd->writesize * len);
 
         for (i = startblock; i < numblocks;) {
@@ -1301,7 +1301,6 @@ static struct nand_bbt_descr bbt_mirror_no_bbt_descr = {
         .pattern = mirror_pattern
 };
 
-#define BBT_SCAN_OPTIONS (NAND_BBT_SCANLASTPAGE | NAND_BBT_SCAN2NDPAGE)
 /**
  * nand_create_default_bbt_descr - [Internal] Creates a BBT descriptor structure
  * @this:       NAND chip to create descriptor for
@@ -1324,7 +1323,7 @@ static int nand_create_default_bbt_descr(struct nand_chip *this)
                 printk(KERN_ERR "nand_create_default_bbt_descr: Out of memory\n");
                 return -ENOMEM;
         }
-        bd->options = this->options & BBT_SCAN_OPTIONS;
+        bd->options = this->bbt_options;
         bd->offs = this->badblockpos;
         bd->len = (this->options & NAND_BUSWIDTH_16) ? 2 : 1;
         bd->pattern = scan_ff_pattern;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index c2b9ac4fbc4a..42f70e2d33af 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -449,6 +449,9 @@ struct nand_buffers {
  * @options:            [BOARDSPECIFIC] various chip options. They can partly
  *                      be set to inform nand_scan about special functionality.
  *                      See the defines for further explanation.
+ * @bbt_options:        [INTERN] bad block specific options. All options used
+ *                      here must come from bbm.h. By default, these options
+ *                      will be copied to the appropriate nand_bbt_descr's.
  * @badblockpos:        [INTERN] position of the bad block marker in the oob
  *                      area.
  * @badblockbits:       [INTERN] number of bits to left-shift the bad block
@@ -509,6 +512,7 @@ struct nand_chip {
 
         int chip_delay;
         unsigned int options;
+        unsigned int bbt_options;
 
         int page_shift;
         int phys_erase_shift;