Merge branch 'master' of git://www.denx.de/git/u-boot-mmc

[karo-tx-uboot.git] / drivers / mtd / spi / spansion.c

diff --git a/drivers/mtd/spi/spansion.c b/drivers/mtd/spi/spansion.c
index bc558c4c96ba317bffac1a66730bc28c2f49be32..b3ef90f136367e954aaf08a2477f9c17810fd620 100644 (file)
--- a/drivers/mtd/spi/spansion.c
+++ b/drivers/mtd/spi/spansion.c
@@ -89,19 +89,26 @@ static const struct spansion_spi_flash_params spansion_spi_flash_table[] = {
                .nr_sectors = 64,
                .name = "S25FL032P",
        },
+       {
+               .idcode1 = 0x0216,
+               .idcode2 = 0x4d00,
+               .pages_per_sector = 256,
+               .nr_sectors = 128,
+               .name = "S25FL064P",
+       },
        {
                .idcode1 = 0x2018,
                .idcode2 = 0x4d01,
                .pages_per_sector = 256,
                .nr_sectors = 256,
-               .name = "S25FL129P_64K",
+               .name = "S25FL129P_64K/S25FL128S",
        },
        {
                .idcode1 = 0x0219,
                .idcode2 = 0x4d01,
                .pages_per_sector = 256,
                .nr_sectors = 512,
-               .name = "S25FL256S",
+               .name = "S25FL256S_64K",
        },
 };