2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 4205b9423b89..56a8b2005bda 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -4085,7 +4085,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         mtd->writebufsize = mtd->writesize;
 
         /* Unlock whole block */
-        this->unlock_all(mtd);
+        if (!(this->options & ONENAND_SKIP_INITIAL_UNLOCKING))
+                this->unlock_all(mtd);
 
         ret = this->scan_bbt(mtd);
         if ((!FLEXONENAND(this)) || ret)
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index ae418e41d8f5..52b6f187bf49 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -198,6 +198,7 @@ struct onenand_chip {
 #define ONENAND_SKIP_UNLOCK_CHECK       (0x0100)
 #define ONENAND_PAGEBUF_ALLOC           (0x1000)
 #define ONENAND_OOBBUF_ALLOC            (0x2000)
+#define ONENAND_SKIP_INITIAL_UNLOCKING  (0x4000)
 
 #define ONENAND_IS_4KB_PAGE(this)                                       \
         (this->options & ONENAND_HAS_4KB_PAGE)