diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-01-10 02:20:12 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-11 21:00:53 +0200 |
| commit | 6163045bcd276818d9ad6bdd1bf36ddcd60d014b (patch) | |
| tree | 732ba3dd3b07977e38c773960dfb76c78ee4ab09 /drivers/mtd/spi/eon.c | |
| parent | 000044d8bfdc803a1a97e68ba95f289bfe5ad149 (diff) | |
| download | blackbird-obmc-uboot-6163045bcd276818d9ad6bdd1bf36ddcd60d014b.tar.gz blackbird-obmc-uboot-6163045bcd276818d9ad6bdd1bf36ddcd60d014b.zip | |
sf: unify status polling for ready bit
All of the spi flash drivers implement the status register polling for
detecting the device ready state, so unify them all in a new helper
function -- spi_flash_wait_ready.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'drivers/mtd/spi/eon.c')
| -rw-r--r-- | drivers/mtd/spi/eon.c | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/drivers/mtd/spi/eon.c b/drivers/mtd/spi/eon.c index 02c3bb9304..4af1e068c3 100644 --- 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,40 +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) { @@ -160,11 +124,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; @@ -221,11 +183,9 @@ int eon_erase(struct spi_flash *flash, u32 offset, size_t len) break; } - ret = eon_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT); - if (ret < 0) { - debug("SF: EON page erase timed out\n"); + ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT); + if (ret) break; - } } debug("SF: EON: Successfully erased %u bytes @ 0x%x\n", |
