Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[u-boot] / drivers / mtd / spi / spansion.c

diff --git a/drivers/mtd/spi/spansion.c b/drivers/mtd/spi/spansion.c
index bc558c4c96ba317bffac1a66730bc28c2f49be32..dad30b54c54e97547f13c14039483da30e1eb409 100644 (file)
--- a/drivers/mtd/spi/spansion.c
+++ b/drivers/mtd/spi/spansion.c
@@ -94,7 +94,7 @@ static const struct spansion_spi_flash_params spansion_spi_flash_table[] = {
                .idcode2 = 0x4d01,
                .pages_per_sector = 256,
                .nr_sectors = 256,
-               .name = "S25FL129P_64K",
+               .name = "S25FL129P_64K/S25FL128S",
        },
        {
                .idcode1 = 0x0219,