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 0e126f40c5e55ac9e39498c0eab585583f850e5b..c399bf14d1f6ec52c719ec26e55c83ea2d0ea3d4 100644 (file)
--- a/drivers/mtd/spi/winbond.c
+++ b/drivers/mtd/spi/winbond.c
@@ -10,107 +10,110 @@
 
 #include "spi_flash_internal.h"
 
-/* M25Pxx-specific commands */
-#define CMD_W25_SE             0x20    /* Sector (4K) Erase */
-#define CMD_W25_BE             0xd8    /* Block (64K) Erase */
-#define CMD_W25_CE             0xc7    /* Chip Erase */
-
 struct winbond_spi_flash_params {
        uint16_t        id;
-       /* Log2 of page size in power-of-two mode */
-       uint8_t         l2_page_size;
-       uint16_t        pages_per_sector;
-       uint16_t        sectors_per_block;
        uint16_t        nr_blocks;
        const char      *name;
 };
 
 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,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 8,
                .name                   = "W25X40",
        },
        {
                .id                     = 0x3015,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 32,
                .name                   = "W25X16",
        },
        {
                .id                     = 0x3016,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 64,
                .name                   = "W25X32",
        },
        {
                .id                     = 0x3017,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 128,
                .name                   = "W25X64",
        },
        {
                .id                     = 0x4014,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 16,
-               .name                   = "W25Q80BL",
+               .name                   = "W25Q80BL/W25Q80BV",
        },
        {
                .id                     = 0x4015,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 32,
-               .name                   = "W25Q16",
+               .name                   = "W25Q16CL/W25Q16DV",
        },
        {
                .id                     = 0x4016,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 64,
-               .name                   = "W25Q32",
+               .name                   = "W25Q32BV/W25Q32FV_SPI",
        },
        {
                .id                     = 0x4017,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 128,
-               .name                   = "W25Q64",
+               .name                   = "W25Q64CV/W25Q64FV_SPI",
        },
        {
                .id                     = 0x4018,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 256,
-               .name                   = "W25Q128",
+               .name                   = "W25Q128BV/W25Q128FV_SPI",
+       },
+       {
+               .id                     = 0x4019,
+               .nr_blocks              = 512,
+               .name                   = "W25Q256",
+       },
+       {
+               .id                     = 0x5014,
+               .nr_blocks              = 16,
+               .name                   = "W25Q80BW",
+       },
+       {
+               .id                     = 0x6015,
+               .nr_blocks              = 32,
+               .name                   = "W25Q16DW",
+       },
+       {
+               .id                     = 0x6016,
+               .nr_blocks              = 64,
+               .name                   = "W25Q32DW/W25Q32FV_QPI",
+       },
+       {
+               .id                     = 0x6017,
+               .nr_blocks              = 128,
+               .name                   = "W25Q64DW/W25Q64FV_QPI",
+       },
+       {
+               .id                     = 0x6018,
+               .nr_blocks              = 256,
+               .name                   = "W25Q128FW/W25Q128FV_QPI",
        },
 };
 
-static int winbond_erase(struct spi_flash *flash, u32 offset, size_t len)
-{
-       return spi_flash_cmd_erase(flash, CMD_W25_SE, offset, len);
-}
-
 struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
 {
        const struct winbond_spi_flash_params *params;
        struct spi_flash *flash;
        unsigned int i;
-       unsigned page_size;
 
        for (i = 0; i < ARRAY_SIZE(winbond_spi_flash_table); i++) {
                params = &winbond_spi_flash_table[i];
@@ -124,26 +127,15 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
                return NULL;
        }
 
-       flash = malloc(sizeof(*flash));
+       flash = spi_flash_alloc_base(spi, params->name);
        if (!flash) {
                debug("SF: Failed to allocate memory\n");
                return NULL;
        }
 
-       flash->spi = spi;
-       flash->name = params->name;
-
-       /* Assuming power-of-two page size initially. */
-       page_size = 1 << params->l2_page_size;
-
-       flash->write = spi_flash_cmd_write_multi;
-       flash->erase = winbond_erase;
-       flash->read = spi_flash_cmd_read_fast;
-       flash->page_size = page_size;
-       flash->sector_size = page_size * params->pages_per_sector;
-       flash->size = page_size * params->pages_per_sector
-                               * params->sectors_per_block
-                               * params->nr_blocks;
+       flash->page_size = 256;
+       flash->sector_size = (idcode[1] == 0x20) ? 65536 : 4096;
+       flash->size = 4096 * 16 * params->nr_blocks;
 
        return flash;
 }