Unverified Commit 075fd6df authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

mtd: spi-nor: spansion: Differentiate between s25fl256s and s25fs256s 



s25fs256s was identified as s25fl256s. Differentiate between them by
the Family ID using the INFO6 macro.

Fixes: b199489d ("mtd: spi-nor: add the framework for SPI NOR")
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
parent c26d0d87

drivers/mtd/spi-nor/spansion.c

+12 −6
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ 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,

	{ "s25fl256s0", INFO6(0x010219, 0x4d0080, 256 * 1024, 128,

			      SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			      USE_CLSR) },

	{ "s25fl256s1", INFO(0x010219, 0x4d01,  64 * 1024, 512,

	{ "s25fl256s1", INFO6(0x010219, 0x4d0180, 64 * 1024, 512,

			      SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			      USE_CLSR) },

	{ "s25fl512s",  INFO6(0x010220, 0x4d0080, 256 * 1024, 256,
@@ -55,6 +55,12 @@ static const struct flash_info spansion_parts[] = { 
	{ "s25fs128s1", INFO6(0x012018, 0x4d0181, 64 * 1024, 256,

			      SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR)

	  .fixups = &s25fs_s_fixups, },

	{ "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)

	  .fixups = &s25fs_s_fixups, },

CRA Git | Maintained and supported by SUSTech CRA and CCSE