Skip to contentSkip to conversation

Fix and add some spi-nor flash parts (v5)

PATCH Superseded Weijie Gao 2 participants 15 messages Jun 15 – Jul 17

Subsystems (2)

v6 of 10 Superseded Latest is v10 →

lore
Share & tools
lore

Weijie Gao

author
#0 lore raw

v6 cover Fix and add some spi-nor flash parts (v5)

This patch series correct some existing flash parts and add some new parts.

Changes in v6:
Remove quad read flags from some EON flashes

Changes in v5:
Remove flags for locking from newly added flashes

Changes in v4:
Remove GD25Q256 and correct flags for GD25B256 (locking is not supported) Adjust commit message format

Changes in v3:
Correct flags for GD25Q256 (locking is not supported) Add brief flash description in commit message

Changes in v2:
Reorder and renaming winbond flash parts

Weijie Gao (7):
mtd: spi-nor-ids: Correct flash flags for ESMT/EON flashes
mtd: spi-nor-ids: Add support for ESMT/EON

    EN25QX128A/EN25QH256/EN25QX256A
  mtd: spi-nor-ids: Remove SPI_NOR_HAS_LOCK flag from GigaDevice
    GD25B256

mtd: spi-nor-ids: Add 4K page support for Macronix MX25L25635E
mtd: spi-nor-ids: Fix Winbond W25Q256JW and remove W25Q256FW
mtd: spi-nor-ids: Reorder winbond parts with part families
mtd: spi-nor-ids: Add support for Winbond W25Q256JV-M/W25Q512JV-M

 drivers/mtd/spi/spi-nor-core.c |   1 +
 drivers/mtd/spi/spi-nor-ids.c  | 183 ++++++++++++---------------------
 include/linux/mtd/spi-nor.h    |   1 +
 3 files changed, 65 insertions(+), 120 deletions(-)
Signature · 1 line
2.45.2
author
#1 lore raw

PATCH v6 1/7 mtd: spi-nor-ids: Correct flash flags for ESMT/EON flashes

All currently supported ESMT/EON flashes supports 4KB sector and dual read. EN25Q80B also supports 1-1-4 quad read.

---
v6: removed SPI_NOR_QUAD_READ from incompatible flashes
v5: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/spi/spi-nor-ids.c +6 -6
index c0fa98424aa..0dacb4abdbc 100644
@@ -90,12 +90,12 @@ const struct flash_info spi_nor_ids[] = {
 #endif
 #ifdef CONFIG_SPI_FLASH_EON		/* EON */
 	/* EON -- en25xxx */
-	{ INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K) },
-	{ INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, 0) },
-	{ INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
-	{ INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, 0) },
-	{ INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, 0) },
-	{ INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K) },
+	{ INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, SECT_4K | SPI_NOR_DUAL_READ) },
+	{ INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_DUAL_READ) },
+	{ INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_DUAL_READ) },
+	{ INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_DUAL_READ) },
+	{ INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_DUAL_READ) },
 #endif
 #ifdef CONFIG_SPI_FRAM_FUJITSU
 	/* Fujitsu MB85RS256TY */
Signature · 1 line
2.45.2
#2 lore raw

RE: [PATCH v6 1/7] mtd: spi-nor-ids: Correct flash flags for ESMT/EON flashes

Hi,

Quoted 26 lines

All currently supported ESMT/EON flashes supports 4KB sector and dual read. EN25Q80B also supports 1-1-4 quad read.

---
v6: removed SPI_NOR_QUAD_READ from incompatible flashes
v5: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/spi/spi-nor-ids.c +0 -2
index c0fa98424aa..0dacb4abdbc 100644
@@ -90,12 +90,12 @@ const struct flash_info spi_nor_ids[] = {
 #endif
 #ifdef CONFIG_SPI_FLASH_EON            /* EON */
        /* EON -- en25xxx */
-       { INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K) },
-       { INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, 0) },

drivers/mtd/spi/spi-nor-ids.c const struct flash_info spi_nor_ids[] = { · line 98

Quoted 10 lines
drivers/mtd/spi/spi-nor-ids.c +6 -4
-       { INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
-       { INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, 0) },
-       { INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, 0) },
-       { INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K) },
+       { INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+       { INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, SECT_4K | SPI_NOR_DUAL_READ) },
+       { INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_DUAL_READ) },
+       { INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_DUAL_READ) },
+       { INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_DUAL_READ) },
+       { INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_DUAL_READ) },

In our discussion in previous revision [1], only en25qh128 supports 1-1-4 read and program, but you set QUAD_READ flag in en25q80b instead. Please fix.

Thanks,
Takahiro

[1]
https://patchwork.ozlabs.org/project/uboot/patch/64ce1a920dc067717de2b39d2e7a5098e6853aab.1781164951.git.weijie.gao@mediatek.com/

author
#3 lore raw

Re: [PATCH v6 1/7] mtd: spi-nor-ids: Correct flash flags for ESMT/EON flashes

Quoted 53 lines · On Fri, 2026-07-03 at 09:03 +0000, [email protected] wrote:

External email : Please do not click links or open attachments until you have verified the sender or the content.

Hi,

Quoted 47 lines

All currently supported ESMT/EON flashes supports 4KB sector and dual read.
EN25Q80B also supports 1-1-4 quad read.

Link:
https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25Q80B.pdf__;!!CTRNKA9wMg0ARbw!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQnA5YmOgE$
Link:
https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25QH128A*20(2TC).pdf__;JQ!!CTRNKA9wMg0ARbw!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQn6Cw3FY0$
Link:
https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25S64A(2SC).pdf__;!!CTRNKA9wMg0ARbw!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQnfRLy1jE$

---
v6: removed SPI_NOR_QUAD_READ from incompatible flashes
v5: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/spi/spi- renamed from drivers/mtd/spi/spi-nor-ids.c +0 -0

nor-ids.c
index c0fa98424aa..0dacb4abdbc 100644

drivers/mtd/spi/spi-nor-ids.c +1 -6
@@ -90,12 +90,12 @@ const struct flash_info spi_nor_ids[] = {
 #endif
 #ifdef CONFIG_SPI_FLASH_EON            /* EON */
        /* EON -- en25xxx */
-       { INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K)
 },
-       { INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, 0) },
-       { INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K)
 },
-       { INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, 0) },
-       { INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, 0) },
-       { INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K)
 },
+       { INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+       { INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, SECT_4K
Quoted 8 lines
Quoted 3 lines

| SPI_NOR_DUAL_READ) },
+ { INFO("en25s64", 0x1c3817, 0, 64 * 1024, 128, SECT_4K
| SPI_NOR_DUAL_READ) },

In our discussion in previous revision [1], only en25qh128 supports 1-1-4
read and program, but you set QUAD_READ flag in en25q80b instead. Please fix.

I reserved this flag because I found a newer datasheet that claims it supports the 6B opcode for 1-1-4 read:

https://www.novitronic.com/Datenbl%C3%A4tter/Aktive%20Komponenten/EN25Q80B%282C%29.pdf

As the EN25Q80B is EOL, I can't buy one for testing. I'll remove this flag in next patch series.

Quoted 6 lines

Thanks,
Takahiro

[1]

https://patchwork.ozlabs.org/project/uboot/patch/64ce1a920dc067717de2b39d2e7a5098e6853aab.1781164951.git.weijie.gao@mediatek.com/

Quoted 1 line
#4 lore raw

RE: [PATCH v6 1/7] mtd: spi-nor-ids: Correct flash flags for ESMT/EON flashes

Hi,

Quoted 69 lines · On Fri, 2026-07-03 at 09:03 +0000, [email protected] wrote:
Quoted 4 lines

External email : Please do not click links or open attachments until you have verified the sender or the content.

Quoted 8 lines

Hi,

Quoted 6 lines

All currently supported ESMT/EON flashes supports 4KB sector and dual read.
EN25Q80B also supports 1-1-4 quad read.

Link:

https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25Q80B.pdf__;!!CTRNKA9wMg0ARbw
!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQnA5YmOgE$

Quoted 2 lines
Quoted 2 lines

Link:

https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25QH128A*20(2TC).pdf__;JQ!!CTR
NKA9wMg0ARbw!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQn6Cw3FY0$

Quoted 2 lines
Quoted 2 lines

Link:

https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25S64A(2SC).pdf__;!!CTRNKA9wMg
0ARbw!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQnfRLy1jE$

Quoted 37 lines
Quoted 37 lines

---
v6: removed SPI_NOR_QUAD_READ from incompatible flashes
v5: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/spi/spi- renamed from drivers/mtd/spi/spi-nor-ids.c +0 -0

nor-ids.c
index c0fa98424aa..0dacb4abdbc 100644

drivers/mtd/spi/spi-nor-ids.c +1 -6
@@ -90,12 +90,12 @@ const struct flash_info spi_nor_ids[] = {
 #endif
 #ifdef CONFIG_SPI_FLASH_EON            /* EON */
        /* EON -- en25xxx */
-       { INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K)
 },
-       { INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, 0) },
-       { INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K)
 },
-       { INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, 0) },
-       { INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, 0) },
-       { INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K)
 },
+       { INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+       { INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, SECT_4K
Quoted 8 lines
Quoted 3 lines

| SPI_NOR_DUAL_READ) },
+ { INFO("en25s64", 0x1c3817, 0, 64 * 1024, 128, SECT_4K
| SPI_NOR_DUAL_READ) },

In our discussion in previous revision [1], only en25qh128 supports 1-1-4
read and program, but you set QUAD_READ flag in en25q80b instead. Please fix.

Quoted 5 lines

I reserved this flag because I found a newer datasheet that claims it supports the 6B opcode for 1-1-4 read:

https://www.novitronic.com/Datenbl%C3%A4tter/Aktive%20Komponenten/EN25Q80B%282C%29.pdf

But why did you drop QUAD_READ flag from en25qh128? Per datasheet, it supports both 1-1-4 read and program.

Quoted 3 lines

As the EN25Q80B is EOL, I can't buy one for testing. I'll remove this flag in next patch series.

I would recommend not to add EOL chips.
We should not expand ID database for chips that nobody has chance to use.

Thanks,
Takahiro

#5 lore raw

RE: [PATCH v6 1/7] mtd: spi-nor-ids: Correct flash flags for ESMT/EON flashes

Quoted 90 lines

-----Original Message-----
From: Kuwano Takahiro (ATV MS MPL PAE - MS)
Sent: Friday, July 17, 2026 3:33 PM
To: 'Weijie Gao' <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: RE: [PATCH v6 1/7] mtd: spi-nor-ids: Correct flash flags for ESMT/EON flashes

Hi,

Quoted 5 lines · On Fri, 2026-07-03 at 09:03 +0000, [email protected] wrote:
Quoted 4 lines

External email : Please do not click links or open attachments until you have verified the sender or the content.

Quoted 9 lines
Quoted 8 lines

Hi,

Quoted 6 lines

All currently supported ESMT/EON flashes supports 4KB sector and dual read.
EN25Q80B also supports 1-1-4 quad read.

Link:

https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25Q80B.pdf__;!!CTRNKA9wMg0ARbw

Quoted 4 lines

!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQnA5YmOgE$

Quoted 2 lines
Quoted 2 lines

Link:

https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25QH128A*20(2TC).pdf__;JQ!!CTR

Quoted 4 lines

NKA9wMg0ARbw!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQn6Cw3FY0$

Quoted 2 lines
Quoted 2 lines

Link:

https://urldefense.com/v3/__https://www.esmt.com.tw/upload/pdf/ESMT/datasheets/EN25S64A(2SC).pdf__;!!CTRNKA9wMg

Quoted 47 lines

0ARbw!j7E681Y4Vzt6S4aIsheiVdVOq9m8dv0YTHDU9h9Bd3fu83ASyITxt4cxou55heRBOS52p8pOfsmu5cjY5uK7MdQnfRLy1jE$

Quoted 37 lines
Quoted 37 lines

---
v6: removed SPI_NOR_QUAD_READ from incompatible flashes
v5: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/spi/spi- renamed from drivers/mtd/spi/spi-nor-ids.c +0 -0

nor-ids.c
index c0fa98424aa..0dacb4abdbc 100644

drivers/mtd/spi/spi-nor-ids.c +1 -6
@@ -90,12 +90,12 @@ const struct flash_info spi_nor_ids[] = {
 #endif
 #ifdef CONFIG_SPI_FLASH_EON            /* EON */
        /* EON -- en25xxx */
-       { INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K)
 },
-       { INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, 0) },
-       { INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K)
 },
-       { INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, 0) },
-       { INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, 0) },
-       { INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K)
 },
+       { INFO("en25q80b",   0x1c3014, 0, 64 * 1024,   16, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+       { INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, SECT_4K
| SPI_NOR_DUAL_READ) },
+       { INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, SECT_4K
Quoted 8 lines
Quoted 3 lines

| SPI_NOR_DUAL_READ) },
+ { INFO("en25s64", 0x1c3817, 0, 64 * 1024, 128, SECT_4K
| SPI_NOR_DUAL_READ) },

In our discussion in previous revision [1], only en25qh128 supports 1-1-4
read and program, but you set QUAD_READ flag in en25q80b instead. Please fix.

Quoted 5 lines

I reserved this flag because I found a newer datasheet that claims it supports the 6B opcode for 1-1-4 read:

https://www.novitronic.com/Datenbl%C3%A4tter/Aktive%20Komponenten/EN25Q80B%282C%29.pdf

Quoted 9 lines

But why did you drop QUAD_READ flag from en25qh128? Per datasheet, it supports both 1-1-4 read and program.

Quoted 3 lines

As the EN25Q80B is EOL, I can't buy one for testing. I'll remove this flag in next patch series.

I would recommend not to add EOL chips.
We should not expand ID database for chips that nobody has chance to use.

Oh sorry, my bad. You don't try to add this chip.
Please ignore my comment.

Quoted 2 lines

Thanks,
Takahiro

author
#6 lore raw

PATCH v6 2/7 mtd: spi-nor-ids: Add support for ESMT/EON EN25QX128A/EN25QH256/EN25QX256A

In reply to Weijie Gao

EN25QX128A/EN25QX256A are 128Mb/256Mb flash devices with Quad interface at max 104MHz clock rate.
EN25QH256 is 256Mb flash device with Quad interface at max 50MHz clock rate. Both flashes supports 2.7-3.6V voltage range. However it only supports 1-4-4 quad read which is not supported by U-Boot now.

These flashes are tested on MediaTek's filogic platform.

---
v6: removed SPI_NOR_QUAD_READ from en25qh256
v5: removed locking related flags
v2-v4: updated commit message

---
 drivers/mtd/spi/spi-nor-core.c | 1 +
 drivers/mtd/spi/spi-nor-ids.c  | 3 +++
 include/linux/mtd/spi-nor.h    | 1 +
 3 files changed, 5 insertions(+)
drivers/mtd/spi/spi-nor-core.c +1 -0
index 937d79af64e..e4f78e740ba 100644
@@ -758,6 +758,7 @@ static int set_4byte(struct spi_nor *nor, const struct flash_info *info,
 	case SNOR_MFR_ISSI:
 	case SNOR_MFR_MACRONIX:
 	case SNOR_MFR_WINBOND:
+	case SNOR_MFR_EON:
 		if (need_wren)
 			write_enable(nor);
 
drivers/mtd/spi/spi-nor-ids.c +3 -0
index 0dacb4abdbc..08f7535adf2 100644
@@ -95,6 +95,9 @@ const struct flash_info spi_nor_ids[] = {
 	{ INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_DUAL_READ) },
 	{ INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_DUAL_READ) },
 	{ INFO("en25qh128",  0x1c7018, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_DUAL_READ) },
+	{ INFO("en25qx128a", 0x1c7118, 0, 64 * 1024,  256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("en25qh256",  0x1c7019, 0, 64 * 1024,  512, SECT_4K | SPI_NOR_DUAL_READ) },
+	{ INFO("en25qx256a", 0x1c7119, 0, 64 * 1024,  512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_DUAL_READ) },
 #endif
 #ifdef CONFIG_SPI_FRAM_FUJITSU
include/linux/mtd/spi-nor.h +1 -0
index 4eef4ab0488..02fa72fb401 100644
@@ -33,6 +33,7 @@
 #define SNOR_MFR_SST		CFI_MFR_SST
 #define SNOR_MFR_WINBOND	0xef /* Also used by some Spansion */
 #define SNOR_MFR_CYPRESS	0x34
+#define SNOR_MFR_EON		CFI_MFR_EON
 
 /*
  * Note on opcode nomenclature: some opcodes have a format like
Signature · 1 line
2.45.2
author
#7 lore raw

PATCH v6 3/7 mtd: spi-nor-ids: Remove SPI_NOR_HAS_LOCK flag from GigaDevice GD25B256

In reply to Weijie Gao

The protection scheme that GD25B256 and all other chips supported is not compatible with the spi-nor driver:
This driver supports BP{0,1,2} + TB,
while GD25B256 implements BP{0,1,2,3} + TB

Fixes e72023c4906 ("mtd: spi-nor-ids: add gigadevice part #")

---
v5-v6: not changed
v4: new

---
 drivers/mtd/spi/spi-nor-ids.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/spi/spi-nor-ids.c +1 -1
index 08f7535adf2..4d07221ae65 100644
@@ -147,7 +147,7 @@ const struct flash_info spi_nor_ids[] = {
 	},
 	/* adding these 3V QSPI flash parts */
 	{INFO("gd25b256", 0xc84019, 0, 64 * 1024, 512,	SECT_4K |
-	SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_4B_OPCODES)	},
+	SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES)},
 	{INFO("gd25b512", 0xc8471A, 0, 64 * 1024, 1024,	SECT_4K |
 	SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_4B_OPCODES)},
 	{INFO("gd55b01g", 0xc8471B, 0, 64 * 1024, 2048,	SECT_4K |
Signature · 1 line
2.45.2
author
#8 lore raw

PATCH v6 4/7 mtd: spi-nor-ids: Add 4K page support for Macronix MX25L25635E

In reply to Weijie Gao

MX25L25635E supports 4KB/32KB/64KB uniform erase sector/blocks.

---
v5-v6: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/spi/spi-nor-ids.c +1 -1
index 4d07221ae65..018a8341553 100644
@@ -323,7 +323,7 @@ const struct flash_info spi_nor_ids[] = {
 	{ INFO("mx25u51245g", 0xc2253a, 0, 64 * 1024, 1024, SECT_4K |
 	       SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
 	{ INFO("mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0) },
-	{ INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("mx25u25635f", 0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
 	{ INFO("mx25v8035f",  0xc22314, 0, 64 * 1024,  16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("mx25r1635f",  0xc22815, 0, 64 * 1024,  32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
Signature · 1 line
2.45.2
#9 lore raw

RE: [PATCH v6 4/7] mtd: spi-nor-ids: Add 4K page support for Macronix MX25L25635E

Hi,

In Subject,
s/4K page/4K sector/

Quoted 17 lines

MX25L25635E supports 4KB/32KB/64KB uniform erase sector/blocks.

---
v5-v6: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/spi/spi-nor-ids.c +0 -0
index 4d07221ae65..018a8341553 100644

drivers/mtd/spi/spi-nor-ids.c const struct flash_info spi_nor_ids[] = { · line 326

Quoted 5 lines
drivers/mtd/spi/spi-nor-ids.c +1 -1
@@ -323,7 +323,7 @@ const struct flash_info spi_nor_ids[] = {
        { INFO("mx25u51245g", 0xc2253a, 0, 64 * 1024, 1024, SECT_4K |
               SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
        { INFO("mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0) },
-       { INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+       { INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

Like as some chips in this series, this chip doesn't support PP_1_1_4 (32h). Maybe using SFDP can correct the chip capability.
If you tested this chip, it would be good to describe test conditions, such as SFDP used (or not), read/program protocols, and so forth.

This is a pre-existing issue in core that adds PP_1_1_4 capability along with READ_1_1_4.

Quoted 5 lines
drivers/mtd/spi/spi-nor-ids.c +0 -1
        { INFO("mx25u25635f", 0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
        { INFO("mx25v8035f",  0xc22314, 0, 64 * 1024,  16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
        { INFO("mx25r1635f",  0xc22815, 0, 64 * 1024,  32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
--

2.45.2

Thanks,
Takahiro

author
#10 lore raw

Re: [PATCH v6 4/7] mtd: spi-nor-ids: Add 4K page support for Macronix MX25L25635E

Quoted 45 lines · On Fri, 2026-07-03 at 08:51 +0000, [email protected] wrote:

External email : Please do not click links or open attachments until you have verified the sender or the content.

Hi,

In Subject,
s/4K page/4K sector/

Quoted 23 lines

MX25L25635E supports 4KB/32KB/64KB uniform erase sector/blocks.

Link:
https://urldefense.com/v3/__https://www.mxic.com.tw/Lists/Datasheet/Attachments/8592/MX25L25635E,*203V,*20256Mb,*20v1.3.pdf__;JSUl!!CTRNKA9wMg0ARbw!kHm23EUX4Wa5BvxT5qIdEZbaVKzcKHdyZz5oaiqiHGnOx_YmCyyAihdv5ilWogF6nMCWOCQ_VvleRcqT6q17vwZaO_hRSb4$

---
v5-v6: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/spi/spi- renamed from drivers/mtd/spi/spi-nor-ids.c +0 -0

nor-ids.c
index 4d07221ae65..018a8341553 100644

drivers/mtd/spi/spi-nor-ids.c +0 -0
@@ -323,7 +323,7 @@ const struct flash_info spi_nor_ids[] = {
        { INFO("mx25u51245g", 0xc2253a, 0, 64 * 1024, 1024, SECT_4K

|
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_4B_OPCODES) },

Quoted 5 lines
        { INFO("mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0) },

- { INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512,
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ { INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

Like as some chips in this series, this chip doesn't support PP_1_1_4 (32h).
Maybe using SFDP can correct the chip capability.
If you tested this chip, it would be good to describe test conditions, such
as SFDP used (or not), read/program protocols, and so forth.

Quoted 3 lines

This is a pre-existing issue in core that adds PP_1_1_4 capability along with
READ_1_1_4.

My test platform supports only 1-1-1 page program. So I can't and didn't test the 1-1-4/1-4-4 page program.

I can remove the SPI_NOR_QUAD_READ flag if necessary.

Quoted 13 lines
Quoted 9 lines
        { INFO("mx25u25635f", 0xc22539, 0, 64 * 1024, 512, SECT_4K
| SPI_NOR_4B_OPCODES) },
        { INFO("mx25v8035f",  0xc22314, 0, 64 * 1024,  16, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
        { INFO("mx25r1635f",  0xc22815, 0, 64 * 1024,  32, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

--
2.45.2

Thanks,
Takahiro

#11 lore raw

RE: [PATCH v6 4/7] mtd: spi-nor-ids: Add 4K page support for Macronix MX25L25635E

Hi,

Quoted 49 lines · On Fri, 2026-07-03 at 08:51 +0000, [email protected] wrote:
Quoted 4 lines

External email : Please do not click links or open attachments until you have verified the sender or the content.

Quoted 9 lines

Hi,

In Subject,
s/4K page/4K sector/

Quoted 4 lines

MX25L25635E supports 4KB/32KB/64KB uniform erase sector/blocks.

Link:

https://urldefense.com/v3/__https://www.mxic.com.tw/Lists/Datasheet/Attachments/8592/MX25L25635E,*203V,*20256Mb
,*20v1.3.pdf__;JSUl!!CTRNKA9wMg0ARbw!kHm23EUX4Wa5BvxT5qIdEZbaVKzcKHdyZz5oaiqiHGnOx_YmCyyAihdv5ilWogF6nMCWOCQ_Vv leRcqT6q17vwZaO_hRSb4$

Quoted 32 lines
Quoted 19 lines

---
v5-v6: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/spi/spi- renamed from drivers/mtd/spi/spi-nor-ids.c +0 -0

nor-ids.c
index 4d07221ae65..018a8341553 100644

drivers/mtd/spi/spi-nor-ids.c +0 -0
@@ -323,7 +323,7 @@ const struct flash_info spi_nor_ids[] = {
        { INFO("mx25u51245g", 0xc2253a, 0, 64 * 1024, 1024, SECT_4K

|
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_4B_OPCODES) },

Quoted 5 lines
        { INFO("mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0) },

- { INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512,
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ { INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

Like as some chips in this series, this chip doesn't support PP_1_1_4 (32h).
Maybe using SFDP can correct the chip capability.
If you tested this chip, it would be good to describe test conditions, such
as SFDP used (or not), read/program protocols, and so forth.

Quoted 9 lines
Quoted 3 lines

This is a pre-existing issue in core that adds PP_1_1_4 capability along with
READ_1_1_4.

My test platform supports only 1-1-1 page program. So I can't and didn't test the 1-1-4/1-4-4 page program.

I can remove the SPI_NOR_QUAD_READ flag if necessary.

You already removed the flag in v7 but I didn't mean removing it. I just wanted to know your test condition.
Someone else might be using this chip with 1-1-4 read and 1-1-1 pp so please keep as it is.

Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
        { INFO("mx25u25635f", 0xc22539, 0, 64 * 1024, 512, SECT_4K
| SPI_NOR_4B_OPCODES) },
        { INFO("mx25v8035f",  0xc22314, 0, 64 * 1024,  16, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
        { INFO("mx25r1635f",  0xc22815, 0, 64 * 1024,  32, SECT_4K
| SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

--
2.45.2

Quoted 3 lines
Quoted 3 lines

Thanks,
Takahiro

Thanks,
Takahiro

author
#12 lore raw

PATCH v6 5/7 mtd: spi-nor-ids: Fix Winbond W25Q256JW and remove W25Q256FW

In reply to Weijie Gao

There's no part named W25Q256FW, only W25Q256JW-M (Non-DTR version) exists with ID ef6019.

Fixes d8c16849a90 (sf: Add Winbond W25Q256 ID)
Fixes 760b75564fd (spi_flash: add a bunch of winbond flashes to id-table)

---
v5-v6: not changed
v3-v4: updated commit message
v2: not changed

---
 drivers/mtd/spi/spi-nor-ids.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/mtd/spi/spi-nor-ids.c +1 -6
index 018a8341553..0f7d4285620 100644
@@ -603,12 +603,7 @@ const struct flash_info spi_nor_ids[] = {
 			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
 	},
 	{
-		INFO("w25q256fw", 0xef6019, 0, 64 * 1024, 512,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q256jw", 0xef7019, 0, 64 * 1024, 512,
+		INFO("w25q256jw", 0xef6019, 0, 64 * 1024, 512,
 			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
 			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
 	},
Signature · 1 line
2.45.2
author
#13 lore raw

PATCH v6 6/7 mtd: spi-nor-ids: Reorder winbond parts with part families

In reply to Weijie Gao

This patch reorders winbond parts with families (0xef20xx, 0xef30xx, ...). Also, parts in the same family are sorted by size.
Some parts are renamed to match their families.

Renamed parts:

1. Removed suffixes due to multiple suffixes matches with the same ID:
w25q80bl -> w25q80
w25q16cl -> w25q16
w25q64cv -> w25q64

2. Add suffix to match their family:
w25q80 -> w25q80bw
w25q01jv -> w25q01jv-q
w25q256jw -> w25q256jw-q
w25q16jv -> w25q16jv-m
w25q32jv -> w25q32jv-m
w25q128jv -> w25q128jv-m
w25q02jv -> w25q02jv-m
w25q128jw -> w25q128jw-m

3. Change to uniform suffix:
w25q01nw-iq -> w25q01nw-q
w25q01jvfim -> w25q01jv-m
w25q01nw-im -> w25q01nw-m
w25q02nw-im -> w25q02nw-m

---
v3-v6: unchanged
v2: new

---
 drivers/mtd/spi/spi-nor-ids.c | 157 +++++++++++-----------------------
 1 file changed, 50 insertions(+), 107 deletions(-)
drivers/mtd/spi/spi-nor-ids.c +50 -107
index 0f7d4285620..0e93fb6070b 100644
@@ -544,123 +544,66 @@ const struct flash_info spi_nor_ids[] = {
 	{ INFO("w25x40", 0xef3013, 0, 64 * 1024,  8,  SECT_4K) },
 	{ INFO("w25x16", 0xef3015, 0, 64 * 1024,  32, SECT_4K) },
 	{ INFO("w25x32", 0xef3016, 0, 64 * 1024,  64, SECT_4K) },
-	{ INFO("w25q20cl", 0xef4012, 0, 64 * 1024,  4, SECT_4K) },
-	{ INFO("w25q20bw", 0xef5012, 0, 64 * 1024,  4, SECT_4K) },
-	{ INFO("w25q20ew", 0xef6012, 0, 64 * 1024,  4, SECT_4K) },
-	{
-		INFO("w25q16dw", 0xef6015, 0, 64 * 1024,  32,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q32dw", 0xef6016, 0, 64 * 1024,  64,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q16jv", 0xef7015, 0, 64 * 1024,  32,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
-	},
-	{
-		INFO("w25q32jv", 0xef7016, 0, 64 * 1024,  64,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q32jwm", 0xef8016, 0, 64 * 1024,  64,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q256jwm", 0xef8019, 0, 64 * 1024, 512,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
 	{ INFO("w25x64", 0xef3017, 0, 64 * 1024, 128, SECT_4K) },
-	{
-		INFO("w25q64dw", 0xef6017, 0, 64 * 1024, 128,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q64jv", 0xef7017, 0, 64 * 1024, 128,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q128fw", 0xef6018, 0, 64 * 1024, 256,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q128jv", 0xef7018, 0, 64 * 1024, 256,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q128jw", 0xef8018, 0, 64 * 1024, 256,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q256jw", 0xef6019, 0, 64 * 1024, 512,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q512nwq", 0xef6020, 0, 64 * 1024, 1024,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q512nwm", 0xef8020, 0, 64 * 1024, 1024,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q512jvq", 0xef4020, 0, 64 * 1024, 1024,
-		     SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-		     SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q01jv", 0xef4021, 0, 64 * 1024, 2048,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q01jvfim", 0xef7021, 0, 64 * 1024, 2048,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{
-		INFO("w25q02jv", 0xef7022, 0, 64 * 1024, 4096,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
-	{ INFO("w25q80", 0xef5014, 0, 64 * 1024,  16, SECT_4K) },
-	{ INFO("w25q80bl", 0xef4014, 0, 64 * 1024,  16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-	{
-		INFO("w25q16cl", 0xef4015, 0, 64 * 1024,  32,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
+	{ INFO("w25q20cl", 0xef4012, 0, 64 * 1024,  4, SECT_4K) },
+	{ INFO("w25q80", 0xef4014, 0, 64 * 1024,  16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("w25q16", 0xef4015, 0, 64 * 1024,  32,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
 	{ INFO("w25q32", 0xef4016, 0, 64 * 1024,  64, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-	{ INFO("w25q64cv", 0xef4017, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("w25q64", 0xef4017, 0, 64 * 1024,  128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("w25q128", 0xef4018, 0, 64 * 1024, 256,
-			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
-			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-	},
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
 	{ INFO("w25q256", 0xef4019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("w25q512jv-q", 0xef4020, 0, 64 * 1024, 1024,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q01jv-q", 0xef4021, 0, 64 * 1024, 2048,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q20bw", 0xef5012, 0, 64 * 1024,  4, SECT_4K) },
+	{ INFO("w25q80bw", 0xef5014, 0, 64 * 1024,  16, SECT_4K) },
+	{ INFO("w25q20ew", 0xef6012, 0, 64 * 1024,  4, SECT_4K) },
+	{ INFO("w25q16dw", 0xef6015, 0, 64 * 1024,  32,
+	        SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q32dw", 0xef6016, 0, 64 * 1024,  64,
+	        SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q64dw", 0xef6017, 0, 64 * 1024, 128,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q128fw", 0xef6018, 0, 64 * 1024, 256,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q256jw-q", 0xef6019, 0, 64 * 1024, 512,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q512nw-q", 0xef6020, 0, 64 * 1024, 1024,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q01nw-q", 0xef6021, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("w25m512jw", 0xef6119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("w25q16jv-m", 0xef7015, 0, 64 * 1024,  32,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("w25q32jv-m", 0xef7016, 0, 64 * 1024,  64,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q64jv-m", 0xef7017, 0, 64 * 1024, 128,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q128jv-m", 0xef7018, 0, 64 * 1024, 256,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q01jv-m", 0xef7021, 0, 64 * 1024, 2048,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q02jv-m", 0xef7022, 0, 64 * 1024, 4096,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
 	{ INFO("w25m512jv", 0xef7119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("w25q32jw-m", 0xef8016, 0, 64 * 1024,  64,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q128jw-m", 0xef8018, 0, 64 * 1024, 256,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q256jw-m", 0xef8019, 0, 64 * 1024, 512,
+	      SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q512nw-m", 0xef8020, 0, 64 * 1024, 1024,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q01nw-m", 0xef8021, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+	{ INFO("w25q02nw-m", 0xef8022, 0, 64 * 1024, 4096, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("w25h02jv", 0xef9022, 0, 64 * 1024, 4096, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("w25h512nw-am", 0xefa020, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("w25h01nw-am", 0xefa021, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ INFO("w25h02nw-am", 0xefa022, 0, 64 * 1024, 4096, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-	{ INFO("w25q01nw-iq", 0xef6021, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-	{ INFO("w25q01nw-im", 0xef8021, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-	{ INFO("w25q02nw-im", 0xef8022, 0, 64 * 1024, 4096, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-	{ INFO("w77q51nw", 0xef8a1a, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
+	{ INFO("w77q51nw", 0xef8a1a, 0, 64 * 1024, 1024,
+	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
 #endif
 #ifdef CONFIG_SPI_FLASH_XMC
 	/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
Signature · 1 line
2.45.2
author
#14 lore raw

PATCH v6 7/7 mtd: spi-nor-ids: Add support for Winbond W25Q256JV-M/W25Q512JV-M

In reply to Weijie Gao

W25Q256JV-M/W25Q512JV-M are 256Mb/512Mb flash devices with Quad interface at max 104MHz clock rate. DTR is not supported.
These flashes supports 2.7-3.6V voltage range.

Both tested on MediaTek's filogic platform.

---
v6: unchanged
v5: removed locking related flags
v3-v4: updated commit message
v2: refactored with previous patch. updated commit message

---
 drivers/mtd/spi/spi-nor-ids.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/mtd/spi/spi-nor-ids.c +2 -0
index 0e93fb6070b..116384a8323 100644
@@ -583,6 +583,8 @@ const struct flash_info spi_nor_ids[] = {
 	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
 	{ INFO("w25q128jv-m", 0xef7018, 0, 64 * 1024, 256,
 	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+	{ INFO("w25q256jv-m", 0xef7019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ ) },
+	{ INFO("w25q512jv-m", 0xef7020, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ ) },
 	{ INFO("w25q01jv-m", 0xef7021, 0, 64 * 1024, 2048,
 	       SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
 	{ INFO("w25q02jv-m", 0xef7022, 0, 64 * 1024, 4096,
Signature · 1 line
2.45.2