Commit 6b49e58d authored by Yoshio Furuyama's avatar Yoshio Furuyama Committed by Miquel Raynal
Browse files

mtd: spinand: toshiba: Rename function name to change suffix and prefix (8Gbit) 



The suffix was changed from "G" to "J" to classify between 1st generation
and 2nd generation serial NAND devices (which now belong to the Kioxia
brand).
As reference that's
1st generation device of 1Gbit product is "TC58CVG0S3HRAIG"
2nd generation device of 1Gbit product is "TC58CVG0S3HRAIJ".

The 8Gbit type "TH58CxG3S0HRAIJ" is new to Kioxia's serial NAND lineup and
the prefix was changed from "TC58" to "TH58".

Thus the functions were renamed from tc58cxgxsx_*() to tx58cxgxsxraix_*().

Signed-off-by: default avatarYoshio Furuyama <ytc-mb-yfuruyama7@kioxia.com>
Reviewed-by: default avatarFrieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/0dedd9869569a17625822dba87878254d253ba0e.1584949601.git.ytc-mb-yfuruyama7@kioxia.com
parent 19301d54

drivers/mtd/nand/spi/toshiba.c

+30 −30
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static SPINAND_OP_VARIANTS(write_cache_variants, 
static SPINAND_OP_VARIANTS(update_cache_variants,

		SPINAND_PROG_LOAD(false, 0, NULL, 0));



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

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

					struct mtd_oob_region *region)

{

	if (section > 0)
@@ -38,7 +38,7 @@ static int tc58cxgxsx_ooblayout_ecc(struct mtd_info *mtd, int section, 
	return 0;

}



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

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

					 struct mtd_oob_region *region)

{

	if (section > 0)
@@ -51,12 +51,12 @@ static int tc58cxgxsx_ooblayout_free(struct mtd_info *mtd, int section, 
	return 0;

}



static const struct mtd_ooblayout_ops tc58cxgxsx_ooblayout = {

	.ecc = tc58cxgxsx_ooblayout_ecc,

	.free = tc58cxgxsx_ooblayout_free,

static const struct mtd_ooblayout_ops tx58cxgxsxraix_ooblayout = {

	.ecc = tx58cxgxsxraix_ooblayout_ecc,

	.free = tx58cxgxsxraix_ooblayout_free,

};



static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand,

static int tx58cxgxsxraix_ecc_get_status(struct spinand_device *spinand,

					 u8 status)

{

	struct nand_device *nand = spinand_to_nand(spinand);
@@ -96,7 +96,7 @@ static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand, 


static const struct spinand_info toshiba_spinand_table[] = {

	/* 3.3V 1Gb */

	SPINAND_INFO("TC58CVG0S3",

	SPINAND_INFO("TC58CVG0S3HRAIG",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xC2),

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

		     NAND_ECCREQ(8, 512),
@@ -104,10 +104,10 @@ static const struct spinand_info toshiba_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,

				     tc58cxgxsx_ecc_get_status)),

		     SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,

				     tx58cxgxsxraix_ecc_get_status)),

	/* 3.3V 2Gb */

	SPINAND_INFO("TC58CVG1S3",

	SPINAND_INFO("TC58CVG1S3HRAIG",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xCB),

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

		     NAND_ECCREQ(8, 512),
@@ -115,10 +115,10 @@ static const struct spinand_info toshiba_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,

				     tc58cxgxsx_ecc_get_status)),

		     SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,

				     tx58cxgxsxraix_ecc_get_status)),

	/* 3.3V 4Gb */

	SPINAND_INFO("TC58CVG2S0",

	SPINAND_INFO("TC58CVG2S0HRAIG",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xCD),

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

		     NAND_ECCREQ(8, 512),
@@ -126,10 +126,10 @@ static const struct spinand_info toshiba_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,

				     tc58cxgxsx_ecc_get_status)),

		     SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,

				     tx58cxgxsxraix_ecc_get_status)),

	/* 3.3V 4Gb */

	SPINAND_INFO("TC58CVG2S0",

	SPINAND_INFO("TC58CVG2S0HRAIJ",

			SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xED),

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

		     NAND_ECCREQ(8, 512),
@@ -137,10 +137,10 @@ static const struct spinand_info toshiba_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,

				     tc58cxgxsx_ecc_get_status)),

		     SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,

				     tx58cxgxsxraix_ecc_get_status)),

	/* 1.8V 1Gb */

	SPINAND_INFO("TC58CYG0S3",

	SPINAND_INFO("TC58CYG0S3HRAIG",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xB2),

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

		     NAND_ECCREQ(8, 512),
@@ -148,10 +148,10 @@ static const struct spinand_info toshiba_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,

				     tc58cxgxsx_ecc_get_status)),

		     SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,

				     tx58cxgxsxraix_ecc_get_status)),

	/* 1.8V 2Gb */

	SPINAND_INFO("TC58CYG1S3",

	SPINAND_INFO("TC58CYG1S3HRAIG",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xBB),

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

		     NAND_ECCREQ(8, 512),
@@ -159,10 +159,10 @@ static const struct spinand_info toshiba_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,

				     tc58cxgxsx_ecc_get_status)),

		     SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,

				     tx58cxgxsxraix_ecc_get_status)),

	/* 1.8V 4Gb */

	SPINAND_INFO("TC58CYG2S0",

	SPINAND_INFO("TC58CYG2S0HRAIG",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xBD),

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

		     NAND_ECCREQ(8, 512),
@@ -170,8 +170,8 @@ static const struct spinand_info toshiba_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,

				     tc58cxgxsx_ecc_get_status)),

		     SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,

				     tx58cxgxsxraix_ecc_get_status)),

};



static const struct spinand_manufacturer_ops toshiba_spinand_manuf_ops = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE