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

diff --combined drivers/mtd/spi/spansion.c
index dad30b54c54e97547f13c14039483da30e1eb409,2218e2f027ffd98b3220189c455a59ee4cbd6a15..b3ef90f136367e954aaf08a2477f9c17810fd620
--- 1/drivers/mtd/spi/spansion.c
--- 2/drivers/mtd/spi/spansion.c
+++ b/drivers/mtd/spi/spansion.c
@@@ -89,19 -89,26 +89,26 @@@ static const struct spansion_spi_flash_
                .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",
        },
  };