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

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

diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c
index 27162091c5ac69e4cfe8af4fc7d4f4944391c0a5..c399bf14d1f6ec52c719ec26e55c83ea2d0ea3d4 100644 (file)
--- a/drivers/mtd/spi/winbond.c
+++ b/drivers/mtd/spi/winbond.c
@@ -17,6 +17,21 @@ struct winbond_spi_flash_params {
 };
 
 static const struct winbond_spi_flash_params winbond_spi_flash_table[] = {
+       {
+               .id                     = 0x2014,
+               .nr_blocks              = 16,
+               .name                   = "W25P80",
+       },
+       {
+               .id                     = 0x2015,
+               .nr_blocks              = 32,
+               .name                   = "W25P16",
+       },
+       {
+               .id                     = 0x2016,
+               .nr_blocks              = 64,
+               .name                   = "W25P32",
+       },
        {
                .id                     = 0x3013,
                .nr_blocks              = 8,
@@ -40,42 +55,57 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = {
        {
                .id                     = 0x4014,
                .nr_blocks              = 16,
-               .name                   = "W25Q80BL",
+               .name                   = "W25Q80BL/W25Q80BV",
        },
        {
                .id                     = 0x4015,
                .nr_blocks              = 32,
-               .name                   = "W25Q16",
+               .name                   = "W25Q16CL/W25Q16DV",
        },
        {
                .id                     = 0x4016,
                .nr_blocks              = 64,
-               .name                   = "W25Q32",
+               .name                   = "W25Q32BV/W25Q32FV_SPI",
        },
        {
                .id                     = 0x4017,
                .nr_blocks              = 128,
-               .name                   = "W25Q64",
+               .name                   = "W25Q64CV/W25Q64FV_SPI",
        },
        {
                .id                     = 0x4018,
                .nr_blocks              = 256,
-               .name                   = "W25Q128",
+               .name                   = "W25Q128BV/W25Q128FV_SPI",
+       },
+       {
+               .id                     = 0x4019,
+               .nr_blocks              = 512,
+               .name                   = "W25Q256",
        },
        {
                .id                     = 0x5014,
-               .nr_blocks              = 128,
-               .name                   = "W25Q80",
+               .nr_blocks              = 16,
+               .name                   = "W25Q80BW",
+       },
+       {
+               .id                     = 0x6015,
+               .nr_blocks              = 32,
+               .name                   = "W25Q16DW",
        },
        {
                .id                     = 0x6016,
-               .nr_blocks              = 512,
-               .name                   = "W25Q32DW",
+               .nr_blocks              = 64,
+               .name                   = "W25Q32DW/W25Q32FV_QPI",
        },
        {
                .id                     = 0x6017,
                .nr_blocks              = 128,
-               .name                   = "W25Q64DW",
+               .name                   = "W25Q64DW/W25Q64FV_QPI",
+       },
+       {
+               .id                     = 0x6018,
+               .nr_blocks              = 256,
+               .name                   = "W25Q128FW/W25Q128FV_QPI",
        },
 };
 
@@ -104,7 +134,7 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
        }
 
        flash->page_size = 256;
-       flash->sector_size = 4096;
+       flash->sector_size = (idcode[1] == 0x20) ? 65536 : 4096;
        flash->size = 4096 * 16 * params->nr_blocks;
 
        return flash;