| Message ID | 20200429071058.34385-1-tudor.ambarus@microchip.com |
|---|---|
| State | Accepted |
| Delegated to: | Ambarus Tudor |
| Headers | show |
| Series | mtd: spi-nor: spansion: Differentiate between s25fl256s and s25fs256s | expand |
Hi! On 29/04/2020 09:11, Tudor.Ambarus@microchip.com 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 <alexander.sverdlin@nokia.com> > Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> > --- > drivers/mtd/spi-nor/spansion.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c > index 88183eba8ac1..a68975eb5303 100644 > --- a/drivers/mtd/spi-nor/spansion.c > +++ b/drivers/mtd/spi-nor/spansion.c > @@ -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) },
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 <tudor.ambarus@microchip.com> Applied.
diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c index 88183eba8ac1..a68975eb5303 100644 --- a/drivers/mtd/spi-nor/spansion.c +++ b/drivers/mtd/spi-nor/spansion.c @@ -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) },