2 files changed, 19 insertions, 0 deletions

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index ac9e959802a7..51800a7ef7f8 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -3429,6 +3429,19 @@ static void onenand_check_features(struct mtd_info *mtd)
                 else if (numbufs == 1) {
                         this->options |= ONENAND_HAS_4KB_PAGE;
                         this->options |= ONENAND_HAS_CACHE_PROGRAM;
+                        /*
+                         * There are two different 4KiB pagesize chips
+                         * and no way to detect it by H/W config values.
+                         *
+                         * To detect the correct NOP for each chips,
+                         * It should check the version ID as workaround.
+                         *
+                         * Now it has as following
+                         * KFM4G16Q4M has NOP 4 with version ID 0x0131
+                         * KFM4G16Q5M has NOP 1 with versoin ID 0x013e
+                         */
+                        if ((this->version_id & 0xf) == 0xe)
+                                this->options |= ONENAND_HAS_NOP_1;
                 }
 
         case ONENAND_DEVICE_DENSITY_2Gb:
@@ -4054,6 +4067,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
                         this->ecclayout = &onenand_oob_128;
                         mtd->subpage_sft = 2;
                 }
+                if (ONENAND_IS_NOP_1(this))
+                        mtd->subpage_sft = 0;
                 break;
         case 64:
                 this->ecclayout = &onenand_oob_64;
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index 52b6f187bf49..4596503c9da9 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -184,6 +184,9 @@ struct onenand_chip {
 #define ONENAND_IS_CACHE_PROGRAM(this)                                  \
         (this->options & ONENAND_HAS_CACHE_PROGRAM)
 
+#define ONENAND_IS_NOP_1(this)                                          \
+        (this->options & ONENAND_HAS_NOP_1)
+
 /* Check byte access in OneNAND */
 #define ONENAND_CHECK_BYTE_ACCESS(addr)         (addr & 0x1)
 
@@ -195,6 +198,7 @@ struct onenand_chip {
 #define ONENAND_HAS_2PLANE              (0x0004)
 #define ONENAND_HAS_4KB_PAGE            (0x0008)
 #define ONENAND_HAS_CACHE_PROGRAM       (0x0010)
+#define ONENAND_HAS_NOP_1               (0x0020)
 #define ONENAND_SKIP_UNLOCK_CHECK       (0x0100)
 #define ONENAND_PAGEBUF_ALLOC           (0x1000)
 #define ONENAND_OOBBUF_ALLOC            (0x2000)