sf: Use spi_flash_addr() in write call

Use the existing spi_flash_addr() for 3-byte addressing
cmd filling in write call.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
master
Jagannadha Sutradharudu Teki 12 years ago
parent 1dcd6d0381
commit f76b1bd08b
  1. 7
      drivers/mtd/spi/spi_flash.c

@ -71,7 +71,7 @@ int spi_flash_cmd_write(struct spi_slave *spi, const u8 *cmd, size_t cmd_len,
int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset, int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
size_t len, const void *buf) size_t len, const void *buf)
{ {
unsigned long page_addr, byte_addr, page_size; unsigned long byte_addr, page_size;
size_t chunk_len, actual; size_t chunk_len, actual;
int ret; int ret;
u8 cmd[4]; u8 cmd[4];
@ -97,16 +97,13 @@ int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
return ret; return ret;
} }
#endif #endif
page_addr = offset / page_size;
byte_addr = offset % page_size; byte_addr = offset % page_size;
chunk_len = min(len - actual, page_size - byte_addr); chunk_len = min(len - actual, page_size - byte_addr);
if (flash->spi->max_write_size) if (flash->spi->max_write_size)
chunk_len = min(chunk_len, flash->spi->max_write_size); chunk_len = min(chunk_len, flash->spi->max_write_size);
cmd[1] = page_addr >> 8; spi_flash_addr(offset, cmd);
cmd[2] = page_addr;
cmd[3] = byte_addr;
debug("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n", debug("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);

Loading…
Cancel
Save