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

[u-boot] / drivers / mtd / spi / winbond.c

diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c
index d1358ea24b74f5ac838c6f54ed66a8dbdc3f3509..27162091c5ac69e4cfe8af4fc7d4f4944391c0a5 100644 (file)
--- a/drivers/mtd/spi/winbond.c
+++ b/drivers/mtd/spi/winbond.c
@@ -10,11 +10,6 @@
 
 #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;
        uint16_t        nr_blocks;
@@ -67,13 +62,23 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = {
                .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;
@@ -92,19 +97,13 @@ 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;
-
-       flash->write = spi_flash_cmd_write_multi;
-       flash->erase = winbond_erase;
-       flash->read = spi_flash_cmd_read_fast;
-       flash->page_size = 4096;
+       flash->page_size = 256;
        flash->sector_size = 4096;
        flash->size = 4096 * 16 * params->nr_blocks;