From 76f88e6dca5b7be34f7978fdbda18a8888d1003c Mon Sep 17 00:00:00 2001 From: Jagannadha Sutradharudu Teki Date: Wed, 12 Jun 2013 18:56:51 +0530 Subject: [PATCH] sf: Use read|erase|write_addr instead of offset Used read|erase|write_addr instead of offset in respective flash read/erase/write operations to make sure that all qspi modes are sync with the updated sf framework. Signed-off-by: Jagannadha Sutradharudu Teki Signed-off-by: Michal Simek --- drivers/mtd/spi/spi_flash.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index d2611f2484f..0e0c3fe632f 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -98,7 +98,7 @@ int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset, write_addr /= 2; if (is_dual == MODE_DUAL_STACKED) { - if (offset >= (flash->size / 2)) + if (write_addr >= (flash->size / 2)) flash->spi->u_page = 1; else flash->spi->u_page = 0; @@ -114,7 +114,7 @@ int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset, return ret; } - byte_addr = offset % page_size; + byte_addr = write_addr % page_size; chunk_len = min(len - actual, page_size - byte_addr); @@ -212,7 +212,7 @@ int spi_flash_cmd_read_fast(struct spi_flash *flash, u32 offset, if ((is_dual == MODE_DUAL_STACKED) && (flash->spi->u_page == 1)) bank_sel += ((flash->size / 2) / bank_boun); - remain_len = (bank_boun * (bank_sel + 1) - offset); + remain_len = (bank_boun * (bank_sel + 1) - read_addr); if (len < remain_len) read_len = len; else @@ -315,7 +315,7 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len) erase_addr /= 2; if (is_dual == MODE_DUAL_STACKED) { - if (offset >= (flash->size / 2)) + if (erase_addr >= (flash->size / 2)) flash->spi->u_page = 1; else flash->spi->u_page = 0; @@ -334,7 +334,7 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len) spi_flash_addr(erase_addr, cmd); debug("SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1], - cmd[2], cmd[3], offset); + cmd[2], cmd[3], erase_addr); ret = spi_flash_cmd_write_enable(flash); if (ret) -- 2.47.3