Commit bdb84a22 authored by Thirumalesha Narasimhappa's avatar Thirumalesha Narasimhappa Committed by Miquel Raynal
Browse files

mtd: spinand: micron: Use more specific names 



Rename the read/write/update of SPINAND_OP_VARIANTS() to more
specialized names.

Signed-off-by: default avatarThirumalesha Narasimhappa <nthirumalesha7@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20201108113735.2533-2-nthirumalesha7@gmail.com
parent 1b391c7f

drivers/mtd/nand/spi/micron.c

+30 −30
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


#define MICRON_SELECT_DIE(x)	((x) << 6)



static SPINAND_OP_VARIANTS(read_cache_variants,

static SPINAND_OP_VARIANTS(quadio_read_cache_variants,

		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),

		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),

		SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
@@ -36,11 +36,11 @@ static SPINAND_OP_VARIANTS(read_cache_variants, 
		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(write_cache_variants,

static SPINAND_OP_VARIANTS(x4_write_cache_variants,

		SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),

		SPINAND_PROG_LOAD(true, 0, NULL, 0));



static SPINAND_OP_VARIANTS(update_cache_variants,

static SPINAND_OP_VARIANTS(x4_update_cache_variants,

		SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),

		SPINAND_PROG_LOAD(false, 0, NULL, 0));
@@ -120,9 +120,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x24),

		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status)),
@@ -131,9 +131,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x25),

		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status)),
@@ -142,9 +142,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x14),

		     NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status)),
@@ -153,9 +153,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x15),

		     NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status)),
@@ -164,9 +164,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x36),

		     NAND_MEMORG(1, 2048, 128, 64, 2048, 80, 2, 1, 2),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status),
@@ -176,9 +176,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x34),

		     NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     SPINAND_HAS_CR_FEAT_BIT,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status)),
@@ -187,9 +187,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x35),

		     NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     SPINAND_HAS_CR_FEAT_BIT,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status)),
@@ -198,9 +198,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x46),

		     NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 2),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     SPINAND_HAS_CR_FEAT_BIT,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status),
@@ -210,9 +210,9 @@ static const struct spinand_info micron_spinand_table[] = { 
		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x47),

		     NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 2),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_INFO_OP_VARIANTS(&quadio_read_cache_variants,

					      &x4_write_cache_variants,

					      &x4_update_cache_variants),

		     SPINAND_HAS_CR_FEAT_BIT,

		     SPINAND_ECCINFO(&micron_8_ooblayout,

				     micron_8_ecc_get_status),

CRA Git | Maintained and supported by SUSTech CRA and CCSE