blob: bcc9df87c3cfaf931b790e93891ce85286cac734 [file] [log] [blame]
developeredbe69e2023-06-08 11:08:46 +08001From ec328d836a28d538c38f67f5467b9319d6a950a3 Mon Sep 17 00:00:00 2001
2From: Sam Shih <sam.shih@mediatek.com>
3Date: Fri, 2 Jun 2023 13:06:11 +0800
4Subject: [PATCH]
5 [spi-and-storage][999-2317-mtd-spinand-macronix-Add-Quad-support-for-serial-NAND-flash.patch]
developer53810fa2022-04-19 10:14:08 +08006
developer53810fa2022-04-19 10:14:08 +08007---
8 drivers/mtd/nand/spi/macronix.c | 16 ++++++++--------
9 1 file changed, 8 insertions(+), 8 deletions(-)
10
11diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
developeredbe69e2023-06-08 11:08:46 +080012index ede66b71b..25319b4f8 100644
developer53810fa2022-04-19 10:14:08 +080013--- a/drivers/mtd/nand/spi/macronix.c
14+++ b/drivers/mtd/nand/spi/macronix.c
developeredbe69e2023-06-08 11:08:46 +080015@@ -125,7 +125,7 @@ static const struct spinand_info macronix_spinand_table[] = {
developer53810fa2022-04-19 10:14:08 +080016 SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
17 &write_cache_variants,
18 &update_cache_variants),
19- 0,
20+ SPINAND_HAS_QE_BIT,
21 SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
22 mx35lf1ge4ab_ecc_get_status)),
23 SPINAND_INFO("MX35LF4GE4AD",
developeredbe69e2023-06-08 11:08:46 +080024@@ -135,7 +135,7 @@ static const struct spinand_info macronix_spinand_table[] = {
developer53810fa2022-04-19 10:14:08 +080025 SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
26 &write_cache_variants,
27 &update_cache_variants),
28- 0,
29+ SPINAND_HAS_QE_BIT,
30 SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
31 mx35lf1ge4ab_ecc_get_status)),
32 SPINAND_INFO("MX35LF1G24AD",
developeredbe69e2023-06-08 11:08:46 +080033@@ -145,16 +145,16 @@ static const struct spinand_info macronix_spinand_table[] = {
developer53810fa2022-04-19 10:14:08 +080034 SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
35 &write_cache_variants,
36 &update_cache_variants),
37- 0,
38+ SPINAND_HAS_QE_BIT,
39 SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)),
40 SPINAND_INFO("MX35LF2G24AD",
41 SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x24),
42- NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
43+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1),
44 NAND_ECCREQ(8, 512),
45 SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
46 &write_cache_variants,
47 &update_cache_variants),
48- 0,
49+ SPINAND_HAS_QE_BIT,
50 SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)),
51 SPINAND_INFO("MX35LF4G24AD",
52 SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x35),
developeredbe69e2023-06-08 11:08:46 +080053@@ -163,7 +163,7 @@ static const struct spinand_info macronix_spinand_table[] = {
developer53810fa2022-04-19 10:14:08 +080054 SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
55 &write_cache_variants,
56 &update_cache_variants),
57- 0,
58+ SPINAND_HAS_QE_BIT,
59 SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)),
60 SPINAND_INFO("MX31LF1GE4BC",
61 SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x1e),
developeredbe69e2023-06-08 11:08:46 +080062@@ -172,7 +172,7 @@ static const struct spinand_info macronix_spinand_table[] = {
developer53810fa2022-04-19 10:14:08 +080063 SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
64 &write_cache_variants,
65 &update_cache_variants),
66- 0 /*SPINAND_HAS_QE_BIT*/,
67+ SPINAND_HAS_QE_BIT,
68 SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
69 mx35lf1ge4ab_ecc_get_status)),
70 SPINAND_INFO("MX31UF1GE4BC",
developeredbe69e2023-06-08 11:08:46 +080071@@ -182,7 +182,7 @@ static const struct spinand_info macronix_spinand_table[] = {
developer53810fa2022-04-19 10:14:08 +080072 SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
73 &write_cache_variants,
74 &update_cache_variants),
75- 0 /*SPINAND_HAS_QE_BIT*/,
76+ SPINAND_HAS_QE_BIT,
77 SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
78 mx35lf1ge4ab_ecc_get_status)),
79
developeredbe69e2023-06-08 11:08:46 +080080--
812.34.1
82