mtd: spi-nor: spansion: Differentiate between s25fl256s and s25fs256s
Subsystems (2)
PATCH 1/1 mtd: spi-nor: spansion: Differentiate between s25fl256s and s25fs256s
From: Tudor Ambarus <[email protected]>
s25fs256s was identified as s25fl256s. Differentiate between them by the Family ID using the INFO6 macro.
Fixes b199489d37b2 ("mtd: spi-nor: add the framework for SPI NOR")
Signed-off-by Tudor Ambarus <[email protected]>
--- drivers/mtd/spi-nor/spansion.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/mtd/spi-nor/spansion.c +12 -6
@@ -22,15 +22,21 @@ static const struct flash_info spansion_parts[] = { {"s25fl128s1" ,INFO6 (0x012018 ,0x4d0180 ,64 *1024 ,256 ,SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | USE_CLSR) }, - { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, -SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | - USE_CLSR) }, - { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, -SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | - USE_CLSR) }, + { "s25fl256s0", INFO6(0x010219, 0x4d0080, 256 * 1024, 128, +SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | + USE_CLSR) }, + { "s25fl256s1", INFO6(0x010219, 0x4d0180, 64 * 1024, 512, +SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | + USE_CLSR) }, { "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256,SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | USE_CLSR) }, + { "s25fs256s0", INFO6(0x010219, 0x4d0081, 256 * 1024, 128, +SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | + USE_CLSR) }, + { "s25fs256s1", INFO6(0x010219, 0x4d0181, 64 * 1024, 512, +SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | + USE_CLSR) }, { "s25fs512s", INFO6(0x010220, 0x4d0081, 256 * 1024, 256,SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | USE_CLSR) },
Signature · 5 lines
2.23.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Hi!
Quoted 4 lines · On 29/04/2020 09:11, [email protected] wrote:
s25fs256s was identified as s25fl256s. Differentiate between them by the Family ID using the INFO6 macro.
Fixes b199489d37b2 ("mtd: spi-nor: add the framework for SPI NOR")
Reviewed-by Alexander Sverdlin <[email protected]>
Quoted 37 lines
Signed-off-by Tudor Ambarus <[email protected]>--- drivers/mtd/spi-nor/spansion.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)drivers/mtd/spi-nor/spansion.c +12
-6@@ -22,15 +22,21 @@ static const struct flash_info spansion_parts[] = { {"s25fl128s1" ,INFO6 (0x012018 ,0x4d0180 ,64 *1024 ,256 ,SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | USE_CLSR) }, - { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, -SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | - USE_CLSR) }, - { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, -SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | - USE_CLSR) }, + { "s25fl256s0", INFO6(0x010219, 0x4d0080, 256 * 1024, 128, +SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | + USE_CLSR) }, + { "s25fl256s1", INFO6(0x010219, 0x4d0180, 64 * 1024, 512, +SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | + USE_CLSR) }, { "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256,SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | USE_CLSR) }, + { "s25fs256s0", INFO6(0x010219, 0x4d0081, 256 * 1024, 128, +SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | + USE_CLSR) }, + { "s25fs256s1", INFO6(0x010219, 0x4d0181, 64 * 1024, 512, +SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | + USE_CLSR) }, { "s25fs512s", INFO6(0x010220, 0x4d0081, 256 * 1024, 256,SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | USE_CLSR) },
Signature · 6 lines
Best regards, Alexander Sverdlin. ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
[email protected]
AppliedQuoted 5 lines · On Wednesday, April 29, 2020 10:11:01 AM EEST Tudor Ambarus - M18064 wrote:
s25fs256s was identified as s25fl256s. Differentiate between them by the Family ID using the INFO6 macro.
Fixes b199489d37b2 ("mtd: spi-nor: add the framework for SPI NOR")Signed-off-by Tudor Ambarus <[email protected]>
Applied.
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/