Skip to content

Commit 99eae48

Browse files
rayagondaambarus
authored andcommitted
mtd: spi-nor: update read capabilities for w25q64 and s25fl064k
Both w25q64 and s25fl064k nor flash support QUAD and DUAL read command, hence update the same in flash_info table. This is tested on Broadcom Stingray SoC (bcm958742t). s25fl064k and w25q64 share the same JEDEC ID. The search alg will return the first hit, so s25fl064k even for the winbond parts. We should differentiate between these flashes, but it's not in the scope of this patch. Related discussion at: Link: https://lore.kernel.org/patchwork/patch/628090/ Signed-off-by: Rayagonda Kokatanur <[email protected]> Link: https://lore.kernel.org/r/[email protected] [[email protected]: Update commit message and indicate that s25fl064k and w25q64 share the same JEDEC ID] Signed-off-by: Tudor Ambarus <[email protected]>
1 parent 1371a80 commit 99eae48

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

drivers/mtd/spi-nor/spansion.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ static const struct flash_info spansion_parts[] = {
8383
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
8484
{ "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32,
8585
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
86-
{ "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
86+
{ "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128,
87+
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
8788
{ "s25fl116k", INFO(0x014015, 0, 64 * 1024, 32,
8889
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
8990
{ "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, SECT_4K) },

drivers/mtd/spi-nor/winbond.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ static const struct flash_info winbond_parts[] = {
6464
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
6565
SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
6666
{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
67-
{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
67+
{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128,
68+
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
6869
{ "w25q64dw", INFO(0xef6017, 0, 64 * 1024, 128,
6970
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
7071
SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },

0 commit comments

Comments
 (0)