cmd_ubi: add write.part command, to write a volume in multiple parts

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

diff --git a/drivers/mtd/spi/sst.c b/drivers/mtd/spi/sst.c
index e51dfc7f29fbd15ef0ebbc3b0d8f4b64e28928d1..256867c84481f1238de91a907b829369020efe43 100644 (file)
--- a/drivers/mtd/spi/sst.c
+++ b/drivers/mtd/spi/sst.c
@@ -19,8 +19,7 @@
 #include "spi_flash_internal.h"
 
 #define CMD_SST_BP             0x02    /* Byte Program */
-#define CMD_SST_AAI_WP         0xAD    /* Auto Address Increment Word Program */
-#define CMD_SST_SE             0x20    /* Sector Erase */
+#define CMD_SST_AAI_WP         0xAD    /* Auto Address Incr Word Program */
 
 #define SST_SR_WIP             (1 << 0)        /* Write-in-Progress */
 #define SST_SR_WEL             (1 << 1)        /* Write enable */
@@ -45,80 +44,69 @@ struct sst_spi_flash {
        const struct sst_spi_flash_params *params;
 };
 
-static inline struct sst_spi_flash *to_sst_spi_flash(struct spi_flash *flash)
-{
-       return container_of(flash, struct sst_spi_flash, flash);
-}
-
-#define SST_SECTOR_SIZE (4 * 1024)
-#define SST_PAGE_SIZE   256
 static const struct sst_spi_flash_params sst_spi_flash_table[] = {
        {
                .idcode1 = 0x8d,
                .flags = SST_FEAT_WP,
                .nr_sectors = 128,
                .name = "SST25VF040B",
-       },{
+       },
+       {
                .idcode1 = 0x8e,
                .flags = SST_FEAT_WP,
                .nr_sectors = 256,
                .name = "SST25VF080B",
-       },{
+       },
+       {
                .idcode1 = 0x41,
                .flags = SST_FEAT_WP,
                .nr_sectors = 512,
                .name = "SST25VF016B",
-       },{
+       },
+       {
                .idcode1 = 0x4a,
                .flags = SST_FEAT_WP,
                .nr_sectors = 1024,
                .name = "SST25VF032B",
-       },{
+       },
+       {
                .idcode1 = 0x4b,
                .flags = SST_FEAT_MBP,
                .nr_sectors = 2048,
                .name = "SST25VF064C",
-       },{
+       },
+       {
                .idcode1 = 0x01,
                .flags = SST_FEAT_WP,
                .nr_sectors = 16,
                .name = "SST25WF512",
-       },{
+       },
+       {
                .idcode1 = 0x02,
                .flags = SST_FEAT_WP,
                .nr_sectors = 32,
                .name = "SST25WF010",
-       },{
+       },
+       {
                .idcode1 = 0x03,
                .flags = SST_FEAT_WP,
                .nr_sectors = 64,
                .name = "SST25WF020",
-       },{
+       },
+       {
                .idcode1 = 0x04,
                .flags = SST_FEAT_WP,
                .nr_sectors = 128,
                .name = "SST25WF040",
        },
+       {
+               .idcode1 = 0x05,
+               .flags = SST_FEAT_WP,
+               .nr_sectors = 256,
+               .name = "SST25WF080",
+       },
 };
 
-static int
-sst_enable_writing(struct spi_flash *flash)
-{
-       int ret = spi_flash_cmd_write_enable(flash);
-       if (ret)
-               debug("SF: Enabling Write failed\n");
-       return ret;
-}
-
-static int
-sst_disable_writing(struct spi_flash *flash)
-{
-       int ret = spi_flash_cmd_write_disable(flash);
-       if (ret)
-               debug("SF: Disabling Write failed\n");
-       return ret;
-}
-
 static int
 sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
 {
@@ -131,9 +119,9 @@ sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
        };
 
        debug("BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
-               spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset);
+             spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset);
 
-       ret = sst_enable_writing(flash);
+       ret = spi_flash_cmd_write_enable(flash);
        if (ret)
                return ret;
 
@@ -166,7 +154,7 @@ sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
        }
        offset += actual;
 
-       ret = sst_enable_writing(flash);
+       ret = spi_flash_cmd_write_enable(flash);
        if (ret)
                goto done;
 
@@ -178,11 +166,11 @@ sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 
        for (; actual < len - 1; actual += 2) {
                debug("WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
-                    spi_w8r8(flash->spi, CMD_READ_STATUS), buf + actual, cmd[0],
-                    offset);
+                     spi_w8r8(flash->spi, CMD_READ_STATUS), buf + actual,
+                     cmd[0], offset);
 
                ret = spi_flash_cmd_write(flash->spi, cmd, cmd_len,
-                                         buf + actual, 2);
+                                       buf + actual, 2);
                if (ret) {
                        debug("SF: sst word program failed\n");
                        break;
@@ -197,7 +185,7 @@ sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
        }
 
        if (!ret)
-               ret = sst_disable_writing(flash);
+               ret = spi_flash_cmd_write_disable(flash);
 
        /* If there is a single trailing byte, write it out */
        if (!ret && actual != len)
@@ -211,32 +199,6 @@ sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
        return ret;
 }
 
-static int sst_erase(struct spi_flash *flash, u32 offset, size_t len)
-{
-       return spi_flash_cmd_erase(flash, CMD_SST_SE, offset, len);
-}
-
-static int
-sst_unlock(struct spi_flash *flash)
-{
-       int ret;
-       u8 cmd, status;
-
-       ret = sst_enable_writing(flash);
-       if (ret)
-               return ret;
-
-       cmd = CMD_WRITE_STATUS;
-       status = 0;
-       ret = spi_flash_cmd_write(flash->spi, &cmd, 1, &status, 1);
-       if (ret)
-               debug("SF: Unable to set status byte\n");
-
-       debug("SF: sst: status = %x\n", spi_w8r8(flash->spi, CMD_READ_STATUS));
-
-       return ret;
-}
-
 struct spi_flash *
 spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode)
 {
@@ -255,28 +217,22 @@ spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode)
                return NULL;
        }
 
-       stm = malloc(sizeof(*stm));
+       stm = spi_flash_alloc(struct sst_spi_flash, spi, params->name);
        if (!stm) {
                debug("SF: Failed to allocate memory\n");
                return NULL;
        }
 
        stm->params = params;
-       stm->flash.spi = spi;
-       stm->flash.name = params->name;
 
        if (stm->params->flags & SST_FEAT_WP)
                stm->flash.write = sst_write_wp;
-       else
-               stm->flash.write = spi_flash_cmd_write_multi;
-       stm->flash.erase = sst_erase;
-       stm->flash.read = spi_flash_cmd_read_fast;
-       stm->flash.page_size = SST_PAGE_SIZE;
-       stm->flash.sector_size = SST_SECTOR_SIZE;
+       stm->flash.page_size = 256;
+       stm->flash.sector_size = 4096;
        stm->flash.size = stm->flash.sector_size * params->nr_sectors;
 
        /* Flash powers up read-only, so clear BP# bits */
-       sst_unlock(&stm->flash);
+       spi_flash_cmd_write_status(&stm->flash, 0);
 
        return &stm->flash;
 }