mtd: spinand: micron: Add support for MT29F2G01AAAED

The MT29F2G01AAAED is a single die, 2Gb Micron SPI NAND Flash with 4-bit
ECC

Signed-off-by: Thirumalesha Narasimhappa <nthirumalesha7@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20201108113735.2533-3-nthirumalesha7@gmail.com

diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c
index afe3ba37dcfb8ec92d275f6584629de9a52c39f2..50b7295bc92226cabcd96eeb5515416f0b8a9f79 100644 (file)
--- a/drivers/mtd/nand/spi/micron.c
+++ b/drivers/mtd/nand/spi/micron.c
@@ -44,6 +44,19 @@ static SPINAND_OP_VARIANTS(x4_update_cache_variants,
                SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
                SPINAND_PROG_LOAD(false, 0, NULL, 0));
 
+/* Micron  MT29F2G01AAAED Device */
+static SPINAND_OP_VARIANTS(x4_read_cache_variants,
+                          SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+                          SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
+                          SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
+                          SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
+
+static SPINAND_OP_VARIANTS(x1_write_cache_variants,
+                          SPINAND_PROG_LOAD(true, 0, NULL, 0));
+
+static SPINAND_OP_VARIANTS(x1_update_cache_variants,
+                          SPINAND_PROG_LOAD(false, 0, NULL, 0));
+
 static int micron_8_ooblayout_ecc(struct mtd_info *mtd, int section,
                                  struct mtd_oob_region *region)
 {
@@ -74,6 +87,47 @@ static const struct mtd_ooblayout_ops micron_8_ooblayout = {
        .free = micron_8_ooblayout_free,
 };
 
+static int micron_4_ooblayout_ecc(struct mtd_info *mtd, int section,
+                                 struct mtd_oob_region *region)
+{
+       struct spinand_device *spinand = mtd_to_spinand(mtd);
+
+       if (section >= spinand->base.memorg.pagesize /
+                       mtd->ecc_step_size)
+               return -ERANGE;
+
+       region->offset = (section * 16) + 8;
+       region->length = 8;
+
+       return 0;
+}
+
+static int micron_4_ooblayout_free(struct mtd_info *mtd, int section,
+                                  struct mtd_oob_region *region)
+{
+       struct spinand_device *spinand = mtd_to_spinand(mtd);
+
+       if (section >= spinand->base.memorg.pagesize /
+                       mtd->ecc_step_size)
+               return -ERANGE;
+
+       if (section) {
+               region->offset = 16 * section;
+               region->length = 8;
+       } else {
+               /* section 0 has two bytes reserved for the BBM */
+               region->offset = 2;
+               region->length = 6;
+       }
+
+       return 0;
+}
+
+static const struct mtd_ooblayout_ops micron_4_ooblayout = {
+       .ecc = micron_4_ooblayout_ecc,
+       .free = micron_4_ooblayout_free,
+};
+
 static int micron_select_target(struct spinand_device *spinand,
                                unsigned int target)
 {
@@ -217,6 +271,16 @@ static const struct spinand_info micron_spinand_table[] = {
                     SPINAND_ECCINFO(&micron_8_ooblayout,
                                     micron_8_ecc_get_status),
                     SPINAND_SELECT_TARGET(micron_select_target)),
+       /* M69A 2Gb 3.3V */
+       SPINAND_INFO("MT29F2G01AAAED",
+                    SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x9F),
+                    NAND_MEMORG(1, 2048, 64, 64, 2048, 80, 2, 1, 1),
+                    NAND_ECCREQ(4, 512),
+                    SPINAND_INFO_OP_VARIANTS(&x4_read_cache_variants,
+                                             &x1_write_cache_variants,
+                                             &x1_update_cache_variants),
+                    0,
+                    SPINAND_ECCINFO(&micron_4_ooblayout, NULL)),
 };
 
 static int micron_spinand_init(struct spinand_device *spinand)