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

[platform/kernel/u-boot.git] / drivers / mtd / spi / stmicro.c

diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c
index 2a9972b..7e41ee1 100644 (file)
--- a/drivers/mtd/spi/stmicro.c
+++ b/drivers/mtd/spi/stmicro.c
@@ -140,6 +140,30 @@ static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
                .nr_sectors = 512,
                .name = "N25Q256A",
        },
+       {
+               .id = 0xba20,
+               .pages_per_sector = 256,
+               .nr_sectors = 1024,
+               .name = "N25Q512",
+       },
+       {
+               .id = 0xbb20,
+               .pages_per_sector = 256,
+               .nr_sectors = 1024,
+               .name = "N25Q512A",
+       },
+       {
+               .id = 0xba21,
+               .pages_per_sector = 256,
+               .nr_sectors = 2048,
+               .name = "N25Q1024",
+       },
+       {
+               .id = 0xbb21,
+               .pages_per_sector = 256,
+               .nr_sectors = 2048,
+               .name = "N25Q1024A",
+       },
 };
 
 struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
@@ -186,5 +210,9 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
        flash->sector_size = 256 * params->pages_per_sector;
        flash->size = flash->sector_size * params->nr_sectors;
 
+       /* for >= 512MiB flashes, use flag status instead of read_status */
+       if (flash->size >= 0x4000000)
+               flash->poll_cmd = CMD_FLAG_STATUS;
+
        return flash;
 }