Commit 87ec7690 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

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: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent fbc75387

drivers/mtd/nand/spi/macronix.c

+23 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ static SPINAND_OP_VARIANTS(update_cache_variants, 
		   SPI_MEM_OP_DUMMY(1, 1),				\

		   SPI_MEM_OP_DATA_IN(1, buf, 1))



static SPINAND_OP_VARIANTS(macronix_ops,

		SPINAND_MACRONIX_READ_ECCSR_1S_0_1S(NULL));



static struct spi_mem_op

spinand_fill_macronix_read_eccsr_op(struct spinand_device *spinand, void *valptr)

{
@@ -174,6 +177,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status)),

	SPINAND_INFO("MX35LF2GE4AB",
@@ -195,6 +199,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_CONT_READ(macronix_set_cont_read),
@@ -208,6 +213,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_CONT_READ(macronix_set_cont_read),
@@ -278,6 +284,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status)),

	SPINAND_INFO("MX31UF1GE4BC",
@@ -288,6 +295,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status)),
@@ -301,6 +309,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
		     SPINAND_HAS_QE_BIT |

		     SPINAND_HAS_PROG_PLANE_SELECT_BIT |

		     SPINAND_HAS_READ_PLANE_SELECT_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status)),

	SPINAND_INFO("MX35UF4G24AD",
@@ -312,6 +321,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT |

		     SPINAND_HAS_PROG_PLANE_SELECT_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -324,6 +334,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -336,6 +347,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_CONT_READ(macronix_set_cont_read),
@@ -351,6 +363,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
		     SPINAND_HAS_QE_BIT |

		     SPINAND_HAS_PROG_PLANE_SELECT_BIT |

		     SPINAND_HAS_READ_PLANE_SELECT_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status)),

	SPINAND_INFO("MX35UF2G24AD",
@@ -362,6 +375,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT |

		     SPINAND_HAS_PROG_PLANE_SELECT_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -374,6 +388,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -386,6 +401,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_CONT_READ(macronix_set_cont_read),
@@ -399,6 +415,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_CONT_READ(macronix_set_cont_read)),
@@ -410,6 +427,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status)),

	SPINAND_INFO("MX35UF1G24AD",
@@ -420,6 +438,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES,
@@ -432,6 +451,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_CONT_READ(macronix_set_cont_read),
@@ -445,6 +465,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status),

		     SPINAND_CONT_READ(macronix_set_cont_read)),
@@ -456,6 +477,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status)),

	SPINAND_INFO("MX3UF2GE4BC",
@@ -466,6 +488,7 @@ static const struct spinand_info macronix_spinand_table[] = { 
					      &write_cache_variants,

					      &update_cache_variants),

		     SPINAND_HAS_QE_BIT,

		     SPINAND_INFO_VENDOR_OPS(&macronix_ops),

		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,

				     macronix_ecc_get_status)),

};