Skip to content

Commit 6b49e58

Browse files
Yoshio Furuyamamiquelraynal
Yoshio Furuyama
authored and
miquelraynal
committed
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: Yoshio Furuyama <[email protected]> Reviewed-by: Frieder Schrempf <[email protected]> Signed-off-by: Miquel Raynal <[email protected]> Link: https://lore.kernel.org/linux-mtd/0dedd9869569a17625822dba87878254d253ba0e.1584949601.git.ytc-mb-yfuruyama7@kioxia.com
1 parent 19301d5 commit 6b49e58

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎drivers/mtd/nand/spi/toshiba.c

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ static SPINAND_OP_VARIANTS(write_cache_variants,
2626
static SPINAND_OP_VARIANTS(update_cache_variants,
2727
SPINAND_PROG_LOAD(false, 0, NULL, 0));
2828

29-
static int tc58cxgxsx_ooblayout_ecc(struct mtd_info *mtd, int section,
30-
struct mtd_oob_region *region)
29+
static int tx58cxgxsxraix_ooblayout_ecc(struct mtd_info *mtd, int section,
30+
struct mtd_oob_region *region)
3131
{
3232
if (section > 0)
3333
return -ERANGE;
@@ -38,8 +38,8 @@ static int tc58cxgxsx_ooblayout_ecc(struct mtd_info *mtd, int section,
3838
return 0;
3939
}
4040

41-
static int tc58cxgxsx_ooblayout_free(struct mtd_info *mtd, int section,
42-
struct mtd_oob_region *region)
41+
static int tx58cxgxsxraix_ooblayout_free(struct mtd_info *mtd, int section,
42+
struct mtd_oob_region *region)
4343
{
4444
if (section > 0)
4545
return -ERANGE;
@@ -51,13 +51,13 @@ static int tc58cxgxsx_ooblayout_free(struct mtd_info *mtd, int section,
5151
return 0;
5252
}
5353

54-
static const struct mtd_ooblayout_ops tc58cxgxsx_ooblayout = {
55-
.ecc = tc58cxgxsx_ooblayout_ecc,
56-
.free = tc58cxgxsx_ooblayout_free,
54+
static const struct mtd_ooblayout_ops tx58cxgxsxraix_ooblayout = {
55+
.ecc = tx58cxgxsxraix_ooblayout_ecc,
56+
.free = tx58cxgxsxraix_ooblayout_free,
5757
};
5858

59-
static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand,
60-
u8 status)
59+
static int tx58cxgxsxraix_ecc_get_status(struct spinand_device *spinand,
60+
u8 status)
6161
{
6262
struct nand_device *nand = spinand_to_nand(spinand);
6363
u8 mbf = 0;
@@ -96,82 +96,82 @@ static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand,
9696

9797
static const struct spinand_info toshiba_spinand_table[] = {
9898
/* 3.3V 1Gb */
99-
SPINAND_INFO("TC58CVG0S3",
99+
SPINAND_INFO("TC58CVG0S3HRAIG",
100100
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xC2),
101101
NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
102102
NAND_ECCREQ(8, 512),
103103
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
104104
&write_cache_variants,
105105
&update_cache_variants),
106106
0,
107-
SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
108-
tc58cxgxsx_ecc_get_status)),
107+
SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
108+
tx58cxgxsxraix_ecc_get_status)),
109109
/* 3.3V 2Gb */
110-
SPINAND_INFO("TC58CVG1S3",
110+
SPINAND_INFO("TC58CVG1S3HRAIG",
111111
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xCB),
112112
NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
113113
NAND_ECCREQ(8, 512),
114114
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
115115
&write_cache_variants,
116116
&update_cache_variants),
117117
0,
118-
SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
119-
tc58cxgxsx_ecc_get_status)),
118+
SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
119+
tx58cxgxsxraix_ecc_get_status)),
120120
/* 3.3V 4Gb */
121-
SPINAND_INFO("TC58CVG2S0",
121+
SPINAND_INFO("TC58CVG2S0HRAIG",
122122
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xCD),
123123
NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),
124124
NAND_ECCREQ(8, 512),
125125
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
126126
&write_cache_variants,
127127
&update_cache_variants),
128128
0,
129-
SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
130-
tc58cxgxsx_ecc_get_status)),
129+
SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
130+
tx58cxgxsxraix_ecc_get_status)),
131131
/* 3.3V 4Gb */
132-
SPINAND_INFO("TC58CVG2S0",
132+
SPINAND_INFO("TC58CVG2S0HRAIJ",
133133
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xED),
134134
NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),
135135
NAND_ECCREQ(8, 512),
136136
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
137137
&write_cache_variants,
138138
&update_cache_variants),
139139
0,
140-
SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
141-
tc58cxgxsx_ecc_get_status)),
140+
SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
141+
tx58cxgxsxraix_ecc_get_status)),
142142
/* 1.8V 1Gb */
143-
SPINAND_INFO("TC58CYG0S3",
143+
SPINAND_INFO("TC58CYG0S3HRAIG",
144144
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xB2),
145145
NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
146146
NAND_ECCREQ(8, 512),
147147
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
148148
&write_cache_variants,
149149
&update_cache_variants),
150150
0,
151-
SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
152-
tc58cxgxsx_ecc_get_status)),
151+
SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
152+
tx58cxgxsxraix_ecc_get_status)),
153153
/* 1.8V 2Gb */
154-
SPINAND_INFO("TC58CYG1S3",
154+
SPINAND_INFO("TC58CYG1S3HRAIG",
155155
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xBB),
156156
NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
157157
NAND_ECCREQ(8, 512),
158158
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
159159
&write_cache_variants,
160160
&update_cache_variants),
161161
0,
162-
SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
163-
tc58cxgxsx_ecc_get_status)),
162+
SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
163+
tx58cxgxsxraix_ecc_get_status)),
164164
/* 1.8V 4Gb */
165-
SPINAND_INFO("TC58CYG2S0",
165+
SPINAND_INFO("TC58CYG2S0HRAIG",
166166
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xBD),
167167
NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),
168168
NAND_ECCREQ(8, 512),
169169
SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
170170
&write_cache_variants,
171171
&update_cache_variants),
172172
0,
173-
SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
174-
tc58cxgxsx_ecc_get_status)),
173+
SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
174+
tx58cxgxsxraix_ecc_get_status)),
175175
};
176176

177177
static const struct spinand_manufacturer_ops toshiba_spinand_manuf_ops = {

0 commit comments

Comments
 (0)