Commit 99eae48f authored by Rayagonda Kokatanur's avatar Rayagonda Kokatanur Committed by Tudor Ambarus
Browse files

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: default avatarRayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
Link: https://lore.kernel.org/r/20200529071655.739-1-rayagonda.kokatanur@broadcom.com


[tudor.ambarus@microchip.com: Update commit message and indicate that
s25fl064k and w25q64 share the same JEDEC ID]
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
parent 1371a80c

drivers/mtd/spi-nor/spansion.c

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static const struct flash_info spansion_parts[] = { 
			     SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ "s25fl016k",  INFO(0xef4015,      0,  64 * 1024,  32,

			     SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128, SECT_4K) },

	{ "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128,

			     SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ "s25fl116k",  INFO(0x014015,      0,  64 * 1024,  32,

			     SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ "s25fl132k",  INFO(0x014016,      0,  64 * 1024,  64, SECT_4K) },

drivers/mtd/spi-nor/winbond.c

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static const struct flash_info winbond_parts[] = { 
			    SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			    SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },

	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },

	{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },

	{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128,

			 SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ "w25q64dw", INFO(0xef6017, 0, 64 * 1024, 128,

			   SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			   SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },

CRA Git | Maintained and supported by SUSTech CRA and CCSE