Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c
index 45bd1461eb3a68e4f46d07c8fabf1c2258eb3336..27162091c5ac69e4cfe8af4fc7d4f4944391c0a5 100644 (file)
--- a/drivers/mtd/spi/winbond.c
+++ b/drivers/mtd/spi/winbond.c
@@ -10,100 +10,80 @@
 
 #include "spi_flash_internal.h"
 
-/* M25Pxx-specific commands */
-#define CMD_W25_WREN           0x06    /* Write Enable */
-#define CMD_W25_WRDI           0x04    /* Write Disable */
-#define CMD_W25_RDSR           0x05    /* Read Status Register */
-#define CMD_W25_WRSR           0x01    /* Write Status Register */
-#define CMD_W25_READ           0x03    /* Read Data Bytes */
-#define CMD_W25_FAST_READ      0x0b    /* Read Data Bytes at Higher Speed */
-#define CMD_W25_PP             0x02    /* Page Program */
-#define CMD_W25_SE             0x20    /* Sector (4K) Erase */
-#define CMD_W25_BE             0xd8    /* Block (64K) Erase */
-#define CMD_W25_CE             0xc7    /* Chip Erase */
-#define CMD_W25_DP             0xb9    /* Deep Power-down */
-#define CMD_W25_RES            0xab    /* Release from DP, and Read Signature */
-
 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                     = 0x3013,
+               .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,
+               .nr_blocks              = 16,
+               .name                   = "W25Q80BL",
+       },
        {
                .id                     = 0x4015,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 32,
                .name                   = "W25Q16",
        },
        {
                .id                     = 0x4016,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 64,
                .name                   = "W25Q32",
        },
        {
                .id                     = 0x4017,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 128,
                .name                   = "W25Q64",
        },
        {
                .id                     = 0x4018,
-               .l2_page_size           = 8,
-               .pages_per_sector       = 16,
-               .sectors_per_block      = 16,
                .nr_blocks              = 256,
                .name                   = "W25Q128",
        },
+       {
+               .id                     = 0x5014,
+               .nr_blocks              = 128,
+               .name                   = "W25Q80",
+       },
+       {
+               .id                     = 0x6016,
+               .nr_blocks              = 512,
+               .name                   = "W25Q32DW",
+       },
+       {
+               .id                     = 0x6017,
+               .nr_blocks              = 128,
+               .name                   = "W25Q64DW",
+       },
 };
 
-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];
@@ -117,26 +97,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 = 4096;
+       flash->size = 4096 * 16 * params->nr_blocks;
 
        return flash;
 }