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

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

diff --git a/drivers/mtd/spi/sst.c b/drivers/mtd/spi/sst.c
index dcc0bbe4b136ad19a5893123989f26fd2ebf52bb..95f5490c350ac0f85287b518f1b2427286c30ee3 100644 (file)
--- a/drivers/mtd/spi/sst.c
+++ b/drivers/mtd/spi/sst.c
@@ -93,24 +93,6 @@ static const struct sst_spi_flash_params sst_spi_flash_table[] = {
        },
 };
 
-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)
 {
@@ -125,7 +107,7 @@ 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);
 
-       ret = sst_enable_writing(flash);
+       ret = spi_flash_cmd_write_enable(flash);
        if (ret)
                return ret;
 
@@ -158,7 +140,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;
 
@@ -189,7 +171,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)
@@ -203,27 +185,6 @@ sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
        return ret;
 }
 
-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)
 {
@@ -242,28 +203,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 = spi_flash_cmd_erase;
-       stm->flash.read = spi_flash_cmd_read_fast;
        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;
 }