Skip to content

Commit 87ec769

Browse files
miquelraynalmiquelraynal
committed
mtd: spinand: macronix: Register vendor specific operation
Provide the Macronix specific "read ECC status register" operation so that the core can verify if it is supported by the controller before using it. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
1 parent fbc7538 commit 87ec769

1 file changed

Lines changed: 23 additions & 0 deletions

File tree

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ static SPINAND_OP_VARIANTS(update_cache_variants,
4747
SPI_MEM_OP_DUMMY(1, 1), \
4848
SPI_MEM_OP_DATA_IN(1, buf, 1))
4949

50+
static SPINAND_OP_VARIANTS(macronix_ops,
51+
SPINAND_MACRONIX_READ_ECCSR_1S_0_1S(NULL));
52+
5053
static struct spi_mem_op
5154
spinand_fill_macronix_read_eccsr_op(struct spinand_device *spinand, void *valptr)
5255
{
@@ -174,6 +177,7 @@ static const struct spinand_info macronix_spinand_table[] = {
174177
&write_cache_variants,
175178
&update_cache_variants),
176179
SPINAND_HAS_QE_BIT,
180+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
177181
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
178182
macronix_ecc_get_status)),
179183
SPINAND_INFO("MX35LF2GE4AB",
@@ -195,6 +199,7 @@ static const struct spinand_info macronix_spinand_table[] = {
195199
&write_cache_variants,
196200
&update_cache_variants),
197201
SPINAND_HAS_QE_BIT,
202+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
198203
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
199204
macronix_ecc_get_status),
200205
SPINAND_CONT_READ(macronix_set_cont_read),
@@ -208,6 +213,7 @@ static const struct spinand_info macronix_spinand_table[] = {
208213
&write_cache_variants,
209214
&update_cache_variants),
210215
SPINAND_HAS_QE_BIT,
216+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
211217
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
212218
macronix_ecc_get_status),
213219
SPINAND_CONT_READ(macronix_set_cont_read),
@@ -278,6 +284,7 @@ static const struct spinand_info macronix_spinand_table[] = {
278284
&write_cache_variants,
279285
&update_cache_variants),
280286
SPINAND_HAS_QE_BIT,
287+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
281288
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
282289
macronix_ecc_get_status)),
283290
SPINAND_INFO("MX31UF1GE4BC",
@@ -288,6 +295,7 @@ static const struct spinand_info macronix_spinand_table[] = {
288295
&write_cache_variants,
289296
&update_cache_variants),
290297
SPINAND_HAS_QE_BIT,
298+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
291299
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
292300
macronix_ecc_get_status)),
293301

@@ -301,6 +309,7 @@ static const struct spinand_info macronix_spinand_table[] = {
301309
SPINAND_HAS_QE_BIT |
302310
SPINAND_HAS_PROG_PLANE_SELECT_BIT |
303311
SPINAND_HAS_READ_PLANE_SELECT_BIT,
312+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
304313
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
305314
macronix_ecc_get_status)),
306315
SPINAND_INFO("MX35UF4G24AD",
@@ -312,6 +321,7 @@ static const struct spinand_info macronix_spinand_table[] = {
312321
&update_cache_variants),
313322
SPINAND_HAS_QE_BIT |
314323
SPINAND_HAS_PROG_PLANE_SELECT_BIT,
324+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
315325
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
316326
macronix_ecc_get_status),
317327
SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -324,6 +334,7 @@ static const struct spinand_info macronix_spinand_table[] = {
324334
&write_cache_variants,
325335
&update_cache_variants),
326336
SPINAND_HAS_QE_BIT,
337+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
327338
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
328339
macronix_ecc_get_status),
329340
SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -336,6 +347,7 @@ static const struct spinand_info macronix_spinand_table[] = {
336347
&write_cache_variants,
337348
&update_cache_variants),
338349
SPINAND_HAS_QE_BIT,
350+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
339351
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
340352
macronix_ecc_get_status),
341353
SPINAND_CONT_READ(macronix_set_cont_read),
@@ -351,6 +363,7 @@ static const struct spinand_info macronix_spinand_table[] = {
351363
SPINAND_HAS_QE_BIT |
352364
SPINAND_HAS_PROG_PLANE_SELECT_BIT |
353365
SPINAND_HAS_READ_PLANE_SELECT_BIT,
366+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
354367
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
355368
macronix_ecc_get_status)),
356369
SPINAND_INFO("MX35UF2G24AD",
@@ -362,6 +375,7 @@ static const struct spinand_info macronix_spinand_table[] = {
362375
&update_cache_variants),
363376
SPINAND_HAS_QE_BIT |
364377
SPINAND_HAS_PROG_PLANE_SELECT_BIT,
378+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
365379
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
366380
macronix_ecc_get_status),
367381
SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -374,6 +388,7 @@ static const struct spinand_info macronix_spinand_table[] = {
374388
&write_cache_variants,
375389
&update_cache_variants),
376390
SPINAND_HAS_QE_BIT,
391+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
377392
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
378393
macronix_ecc_get_status),
379394
SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -386,6 +401,7 @@ static const struct spinand_info macronix_spinand_table[] = {
386401
&write_cache_variants,
387402
&update_cache_variants),
388403
SPINAND_HAS_QE_BIT,
404+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
389405
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
390406
macronix_ecc_get_status),
391407
SPINAND_CONT_READ(macronix_set_cont_read),
@@ -399,6 +415,7 @@ static const struct spinand_info macronix_spinand_table[] = {
399415
&write_cache_variants,
400416
&update_cache_variants),
401417
SPINAND_HAS_QE_BIT,
418+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
402419
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
403420
macronix_ecc_get_status),
404421
SPINAND_CONT_READ(macronix_set_cont_read)),
@@ -410,6 +427,7 @@ static const struct spinand_info macronix_spinand_table[] = {
410427
&write_cache_variants,
411428
&update_cache_variants),
412429
SPINAND_HAS_QE_BIT,
430+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
413431
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
414432
macronix_ecc_get_status)),
415433
SPINAND_INFO("MX35UF1G24AD",
@@ -420,6 +438,7 @@ static const struct spinand_info macronix_spinand_table[] = {
420438
&write_cache_variants,
421439
&update_cache_variants),
422440
SPINAND_HAS_QE_BIT,
441+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
423442
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
424443
macronix_ecc_get_status),
425444
SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -432,6 +451,7 @@ static const struct spinand_info macronix_spinand_table[] = {
432451
&write_cache_variants,
433452
&update_cache_variants),
434453
SPINAND_HAS_QE_BIT,
454+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
435455
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
436456
macronix_ecc_get_status),
437457
SPINAND_CONT_READ(macronix_set_cont_read),
@@ -445,6 +465,7 @@ static const struct spinand_info macronix_spinand_table[] = {
445465
&write_cache_variants,
446466
&update_cache_variants),
447467
SPINAND_HAS_QE_BIT,
468+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
448469
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
449470
macronix_ecc_get_status),
450471
SPINAND_CONT_READ(macronix_set_cont_read)),
@@ -456,6 +477,7 @@ static const struct spinand_info macronix_spinand_table[] = {
456477
&write_cache_variants,
457478
&update_cache_variants),
458479
SPINAND_HAS_QE_BIT,
480+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
459481
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
460482
macronix_ecc_get_status)),
461483
SPINAND_INFO("MX3UF2GE4BC",
@@ -466,6 +488,7 @@ static const struct spinand_info macronix_spinand_table[] = {
466488
&write_cache_variants,
467489
&update_cache_variants),
468490
SPINAND_HAS_QE_BIT,
491+
SPINAND_INFO_VENDOR_OPS(&macronix_ops),
469492
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
470493
macronix_ecc_get_status)),
471494
};

0 commit comments

Comments
 (0)