| From 6f802696c2faf0119781fc3b7977a4eedf9ab239 Mon Sep 17 00:00:00 2001 |
| From: Jaime Liao <jaimeliao@mxic.com.tw> |
| Date: Mon, 9 Aug 2021 09:27:52 +0800 |
| Subject: [PATCH] mtd: spinand: macronix: Add Quad support for serial NAND |
| flash |
| |
| Adding FLAG "SPINAND_HAS_QE_BIT" for Quad mode support on Macronix |
| Serial Flash. |
| Validated via normal(default) and QUAD mode by read, erase, read back, |
| on Xilinx Zynq PicoZed FPGA board which included Macronix |
| SPI Host(drivers/spi/spi-mxic.c). |
| |
| Signed-off-by: Jaime Liao <jaimeliao@mxic.com.tw> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Link: https://lore.kernel.org/linux-mtd/1628472472-32008-1-git-send-email-jaimeliao@mxic.com.tw |
| --- |
| drivers/mtd/nand/spi/macronix.c | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c |
| index a9890350db0293..3f31f1381a62c0 100644 |
| --- a/drivers/mtd/nand/spi/macronix.c |
| +++ b/drivers/mtd/nand/spi/macronix.c |
| @@ -126,7 +126,7 @@ static const struct spinand_info macronix_spinand_table[] = { |
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
| &write_cache_variants, |
| &update_cache_variants), |
| - 0, |
| + SPINAND_HAS_QE_BIT, |
| SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, |
| mx35lf1ge4ab_ecc_get_status)), |
| SPINAND_INFO("MX35LF4GE4AD", |
| @@ -136,7 +136,7 @@ static const struct spinand_info macronix_spinand_table[] = { |
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
| &write_cache_variants, |
| &update_cache_variants), |
| - 0, |
| + SPINAND_HAS_QE_BIT, |
| SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, |
| mx35lf1ge4ab_ecc_get_status)), |
| SPINAND_INFO("MX35LF1G24AD", |
| @@ -146,16 +146,16 @@ static const struct spinand_info macronix_spinand_table[] = { |
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
| &write_cache_variants, |
| &update_cache_variants), |
| - 0, |
| + SPINAND_HAS_QE_BIT, |
| SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)), |
| SPINAND_INFO("MX35LF2G24AD", |
| SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x24), |
| - NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), |
| + 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), |
| - 0, |
| + SPINAND_HAS_QE_BIT, |
| SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)), |
| SPINAND_INFO("MX35LF4G24AD", |
| SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x35), |
| @@ -164,7 +164,7 @@ static const struct spinand_info macronix_spinand_table[] = { |
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
| &write_cache_variants, |
| &update_cache_variants), |
| - 0, |
| + SPINAND_HAS_QE_BIT, |
| SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)), |
| SPINAND_INFO("MX31LF1GE4BC", |
| SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x1e), |
| @@ -173,7 +173,7 @@ static const struct spinand_info macronix_spinand_table[] = { |
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
| &write_cache_variants, |
| &update_cache_variants), |
| - 0 /*SPINAND_HAS_QE_BIT*/, |
| + SPINAND_HAS_QE_BIT, |
| SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, |
| mx35lf1ge4ab_ecc_get_status)), |
| SPINAND_INFO("MX31UF1GE4BC", |
| @@ -183,7 +183,7 @@ static const struct spinand_info macronix_spinand_table[] = { |
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
| &write_cache_variants, |
| &update_cache_variants), |
| - 0 /*SPINAND_HAS_QE_BIT*/, |
| + SPINAND_HAS_QE_BIT, |
| SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, |
| mx35lf1ge4ab_ecc_get_status)), |
| |