diff mbox series

[U-Boot] Fix s25fl256s position in spi_flash_ids list

Message ID 20170915142107.26702-1-vgribov@larch-networks.com
State Accepted
Commit db10809c17c7cd8960d0c45248bbef6e76251ad7
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series [U-Boot] Fix s25fl256s position in spi_flash_ids list | expand

Commit Message

Vsevolod Gribov Sept. 15, 2017, 2:21 p.m. UTC 
Spansion S25FS256S and S25FL256S flashes have equal JEDEC ID and ext ID.
As far as S25FL256S occures in spi_flash_ids before S25FS256S, U-Boot
incorrectly detects FS flash as FL. Thus its better to compare with
S25FS256S first.
---
 drivers/mtd/spi/spi_flash_ids.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jagan Teki Sept. 25, 2017, 7:34 a.m. UTC | #1 
On Fri, Sep 15, 2017 at 7:51 PM, Vsevolod Gribov
<vgribov@larch-networks.com> wrote:
> Spansion S25FS256S and S25FL256S flashes have equal JEDEC ID and ext ID.
> As far as S25FL256S occures in spi_flash_ids before S25FS256S, U-Boot
> incorrectly detects FS flash as FL. Thus its better to compare with
> S25FS256S first.
> ---

Applied to u-boot-spi/master

thanks!
diff mbox series

Patch

diff --git a/drivers/mtd/spi/spi_flash_ids.c b/drivers/mtd/spi/spi_flash_ids.c
index c4ccf48..906cc7b 100644
--- a/drivers/mtd/spi/spi_flash_ids.c
+++ b/drivers/mtd/spi/spi_flash_ids.c
@@ -100,8 +100,8 @@  const struct spi_flash_info spi_flash_ids[] = {
 	{"s25fl128s_256k", INFO(0x012018, 0x4d00, 256 * 1024,    64, RD_FULL | WR_QPP) },
 	{"s25fl128s_64k",  INFO(0x012018, 0x4d01,  64 * 1024,   256, RD_FULL | WR_QPP) },
 	{"s25fl256s_256k", INFO(0x010219, 0x4d00, 256 * 1024,   128, RD_FULL | WR_QPP) },
-	{"s25fl256s_64k",  INFO(0x010219, 0x4d01,  64 * 1024,   512, RD_FULL | WR_QPP) },
 	{"s25fs256s_64k",  INFO6(0x010219, 0x4d0181, 64 * 1024, 512, RD_FULL | WR_QPP | SECT_4K) },
+	{"s25fl256s_64k",  INFO(0x010219, 0x4d01,  64 * 1024,   512, RD_FULL | WR_QPP) },
 	{"s25fs512s",      INFO6(0x010220, 0x4d0081, 128 * 1024, 512, RD_FULL | WR_QPP | SECT_4K) },
 	{"s25fl512s_256k", INFO(0x010220, 0x4d00, 256 * 1024,   256, RD_FULL | WR_QPP) },
 	{"s25fl512s_64k",  INFO(0x010220, 0x4d01,  64 * 1024,  1024, RD_FULL | WR_QPP) },