summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/spi/macronix.c
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2023-06-23 19:02:09 +0200
committerMiquel Raynal <miquel.raynal@bootlin.com>2023-06-23 19:02:09 +0200
commitcf431a5998326a0468532a188a188ac2c8e9c55d (patch)
treedcb91b51b6bdd4142ba80c36878b5ea1547022a7 /drivers/mtd/nand/spi/macronix.c
parentefd2ed9351efefe40cbcca36a527adf38ffe1b4d (diff)
parentad5c18c75d2a1de9eeaed60e417d308217f35e73 (diff)
downloadlinux-stable-cf431a5998326a0468532a188a188ac2c8e9c55d.tar.gz
linux-stable-cf431a5998326a0468532a188a188ac2c8e9c55d.tar.bz2
linux-stable-cf431a5998326a0468532a188a188ac2c8e9c55d.zip
Merge branch 'nand/next' into mtd/next
Diffstat (limited to 'drivers/mtd/nand/spi/macronix.c')
-rw-r--r--drivers/mtd/nand/spi/macronix.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
index 722a9738ba37..3dfc7e1e5241 100644
--- a/drivers/mtd/nand/spi/macronix.c
+++ b/drivers/mtd/nand/spi/macronix.c
@@ -299,6 +299,26 @@ static const struct spinand_info macronix_spinand_table[] = {
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
mx35lf1ge4ab_ecc_get_status)),
+ SPINAND_INFO("MX31LF2GE4BC",
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x2e),
+ NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 1, 1, 1),
+ NAND_ECCREQ(8, 512),
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
+ &write_cache_variants,
+ &update_cache_variants),
+ SPINAND_HAS_QE_BIT,
+ SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
+ mx35lf1ge4ab_ecc_get_status)),
+ SPINAND_INFO("MX3UF2GE4BC",
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xae),
+ NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 1, 1, 1),
+ NAND_ECCREQ(8, 512),
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
+ &write_cache_variants,
+ &update_cache_variants),
+ SPINAND_HAS_QE_BIT,
+ SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
+ mx35lf1ge4ab_ecc_get_status)),
};
static const struct spinand_manufacturer_ops macronix_spinand_manuf_ops = {