diff options
| author | Jagannadha Sutradharudu Teki <jaganna@xilinx.com> | 2013-10-08 23:26:47 +0530 |
|---|---|---|
| committer | Jagannadha Sutradharudu Teki <jaganna@xilinx.com> | 2013-10-16 00:14:00 +0530 |
| commit | 6152dd15283dbc3bb65ff02d6faad7ef9ef7f7bc (patch) | |
| tree | 0da35293916e2664c58e14664fddc5291f67d04f | |
| parent | a707b3db562c4c3ae580e2eabb05b59adcc31846 (diff) | |
| download | blackbird-obmc-uboot-6152dd15283dbc3bb65ff02d6faad7ef9ef7f7bc.tar.gz blackbird-obmc-uboot-6152dd15283dbc3bb65ff02d6faad7ef9ef7f7bc.zip | |
sf_ops: Unify bank_sel calculation code
Unified the bank_sel calculation code for erase and
write ops.
Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
| -rw-r--r-- | drivers/mtd/spi/sf_ops.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 2396e2272f..10030385c0 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -59,6 +59,22 @@ static int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, u8 bank_sel) return 0; } + +static int spi_flash_bank(struct spi_flash *flash, u32 offset) +{ + u8 bank_sel; + int ret; + + bank_sel = offset / SPI_FLASH_16MB_BOUN; + + ret = spi_flash_cmd_bankaddr_write(flash, bank_sel); + if (ret) { + debug("SF: fail to set bank%d\n", bank_sel); + return ret; + } + + return 0; +} #endif int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout) @@ -162,15 +178,9 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) cmd[0] = flash->erase_cmd; while (len) { #ifdef CONFIG_SPI_FLASH_BAR - u8 bank_sel; - - bank_sel = offset / SPI_FLASH_16MB_BOUN; - - ret = spi_flash_cmd_bankaddr_write(flash, bank_sel); - if (ret) { - debug("SF: fail to set bank%d\n", bank_sel); + ret = spi_flash_bank(flash, offset); + if (ret < 0) return ret; - } #endif spi_flash_addr(offset, cmd); @@ -203,15 +213,9 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, cmd[0] = CMD_PAGE_PROGRAM; for (actual = 0; actual < len; actual += chunk_len) { #ifdef CONFIG_SPI_FLASH_BAR - u8 bank_sel; - - bank_sel = offset / SPI_FLASH_16MB_BOUN; - - ret = spi_flash_cmd_bankaddr_write(flash, bank_sel); - if (ret) { - debug("SF: fail to set bank%d\n", bank_sel); + ret = spi_flash_bank(flash, offset); + if (ret < 0) return ret; - } #endif byte_addr = offset % page_size; chunk_len = min(len - actual, page_size - byte_addr); |
