sf: localize erase funcs

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

diff --git a/drivers/mtd/spi/eon.c b/drivers/mtd/spi/eon.c
index 02c3bb93047850ba2269bcf3f5d7d048cc4942db..e3de3aabbdff9d52868b4cc3796332cbecb6d388 100644 (file)
--- a/drivers/mtd/spi/eon.c
+++ b/drivers/mtd/spi/eon.c
@@ -25,8 +25,6 @@
 
 #define EON_ID_EN25Q128                0x18
 
-#define EON_SR_WIP             (1 << 0)        /* Write-in-Progress */
-
 struct eon_spi_flash_params {
        u8 idcode1;
        u16 page_size;
@@ -58,60 +56,6 @@ static const struct eon_spi_flash_params eon_spi_flash_table[] = {
        },
 };
 
-static int eon_wait_ready(struct spi_flash *flash, unsigned long timeout)
-{
-       struct spi_slave *spi = flash->spi;
-       unsigned long timebase;
-       int ret;
-       u8 cmd = CMD_EN25Q128_RDSR;
-       u8 status;
-
-       ret = spi_xfer(spi, 8, &cmd, NULL, SPI_XFER_BEGIN);
-       if (ret) {
-               debug("SF: Failed to send command %02x: %d\n", cmd, ret);
-               return ret;
-       }
-
-       timebase = get_timer(0);
-       do {
-               ret = spi_xfer(spi, 8, NULL, &status, 0);
-               if (ret)
-                       return -1;
-
-               if ((status & EON_SR_WIP) == 0)
-                       break;
-
-       } while (get_timer(timebase) < timeout);
-
-       spi_xfer(spi, 0, NULL, NULL, SPI_XFER_END);
-
-       if ((status & EON_SR_WIP) == 0)
-               return 0;
-
-       /* Timed out */
-       return -1;
-}
-
-static int eon_read_fast(struct spi_flash *flash,
-                        u32 offset, size_t len, void *buf)
-{
-       struct eon_spi_flash *eon = to_eon_spi_flash(flash);
-       unsigned long page_addr;
-       unsigned long page_size;
-       u8 cmd[5];
-
-       page_size = eon->params->page_size;
-       page_addr = offset / page_size;
-
-       cmd[0] = CMD_READ_ARRAY_FAST;
-       cmd[1] = page_addr >> 8;
-       cmd[2] = page_addr;
-       cmd[3] = offset % page_size;
-       cmd[4] = 0x00;
-
-       return spi_flash_read_common(flash, cmd, sizeof(cmd), buf, len);
-}
-
 static int eon_write(struct spi_flash *flash,
                     u32 offset, size_t len, const void *buf)
 {
@@ -160,11 +104,9 @@ static int eon_write(struct spi_flash *flash,
                        break;
                }
 
-               ret = eon_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-               if (ret < 0) {
-                       debug("SF: EON page programming timed out\n");
+               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
+               if (ret)
                        break;
-               }
 
                page_addr++;
                byte_addr = 0;
@@ -177,62 +119,9 @@ static int eon_write(struct spi_flash *flash,
        return ret;
 }
 
-int eon_erase(struct spi_flash *flash, u32 offset, size_t len)
+static int eon_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
-       /* block erase */
-       struct eon_spi_flash *eon = to_eon_spi_flash(flash);
-       unsigned long block_size;
-       size_t actual;
-       int ret;
-       u8 cmd[4];
-
-
-       block_size = eon->params->page_size * eon->params->pages_per_sector
-              * eon->params->sectors_per_block;
-
-       if (offset % block_size || len % block_size) {
-               debug("SF: Erase offset/length not multiple of block size\n");
-               return -1;
-       }
-
-       len /= block_size;
-       cmd[0] = CMD_EN25Q128_BE;
-       cmd[2] = 0x00;
-       cmd[3] = 0x00;
-
-       ret = spi_claim_bus(flash->spi);
-       if (ret) {
-               debug("SF: Unable to claim SPI bus\n");
-               return ret;
-       }
-
-       ret = 0;
-       for (actual = 0; actual < len; actual++) {
-               cmd[1] = (offset / block_size) + actual;
-               ret = spi_flash_cmd(flash->spi, CMD_EN25Q128_WREN, NULL, 0);
-               if (ret < 0) {
-                       debug("SF: Enabling Write failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_write(flash->spi, cmd, 4, NULL, 0);
-               if (ret < 0) {
-                       debug("SF: EON page erase failed\n");
-                       break;
-               }
-
-               ret = eon_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT);
-               if (ret < 0) {
-                       debug("SF: EON page erase timed out\n");
-                       break;
-               }
-       }
-
-       debug("SF: EON: Successfully erased %u bytes @ 0x%x\n",
-             len * block_size, offset);
-
-       spi_release_bus(flash->spi);
-       return ret;
+       return spi_flash_cmd_erase(flash, CMD_EN25Q128_BE, offset, len);
 }
 
 struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode)
@@ -264,12 +153,11 @@ struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode)
 
        eon->flash.write = eon_write;
        eon->flash.erase = eon_erase;
-       eon->flash.read = eon_read_fast;
+       eon->flash.read = spi_flash_cmd_read_fast;
+       eon->flash.sector_size = params->page_size * params->pages_per_sector
+           * params->sectors_per_block;
        eon->flash.size = params->page_size * params->pages_per_sector
            * params->nr_sectors;
 
-       debug("SF: Detected %s with page size %u, total %u bytes\n",
-             params->name, params->page_size, eon->flash.size);
-
        return &eon->flash;
 }