Commit 4550d33e authored by Santhosh Kumar K's avatar Santhosh Kumar K Committed by Miquel Raynal
Browse files

mtd: spinand: winbond: Fix oob_layout for W25N01JW 

Fix the W25N01JW's oob_layout according to the datasheet [1]

[1] https://www.winbond.com/hq/product/code-storage-flash-memory/qspinand-flash/?__locale=en&partNo=W25N01JW



Fixes: 6a804fb7 ("mtd: spinand: winbond: add support for serial NAND flash")
Cc: Sridharan S N <quic_sridsn@quicinc.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSanthosh Kumar K <s-k6@ti.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent fd779eac

drivers/mtd/nand/spi/winbond.c

+36 −1
Original line number Diff line number Diff line
@@ -176,6 +176,36 @@ static const struct mtd_ooblayout_ops w25n02kv_ooblayout = { 
	.free = w25n02kv_ooblayout_free,

};



static int w25n01jw_ooblayout_ecc(struct mtd_info *mtd, int section,

				  struct mtd_oob_region *region)

{

	if (section > 3)

		return -ERANGE;



	region->offset = (16 * section) + 12;

	region->length = 4;



	return 0;

}



static int w25n01jw_ooblayout_free(struct mtd_info *mtd, int section,

				   struct mtd_oob_region *region)

{

	if (section > 3)

		return -ERANGE;



	region->offset = (16 * section);

	region->length = 12;



	/* Extract BBM */

	if (!section) {

		region->offset += 2;

		region->length -= 2;

	}



	return 0;

}



static int w35n01jw_ooblayout_ecc(struct mtd_info *mtd, int section,

				  struct mtd_oob_region *region)

{
@@ -206,6 +236,11 @@ static int w35n01jw_ooblayout_free(struct mtd_info *mtd, int section, 
	return 0;

}



static const struct mtd_ooblayout_ops w25n01jw_ooblayout = {

	.ecc = w25n01jw_ooblayout_ecc,

	.free = w25n01jw_ooblayout_free,

};



static const struct mtd_ooblayout_ops w35n01jw_ooblayout = {

	.ecc = w35n01jw_ooblayout_ecc,

	.free = w35n01jw_ooblayout_free,
@@ -394,7 +429,7 @@ static const struct spinand_info winbond_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL),

		     SPINAND_ECCINFO(&w25n01jw_ooblayout, NULL),

		     SPINAND_CONFIGURE_CHIP(w25n0xjw_hs_cfg)),

	SPINAND_INFO("W25N01KV", /* 3.3V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xae, 0x21),