mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
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>
This commit is contained in:
parent
a707b3db56
commit
6152dd1528
1 changed files with 20 additions and 16 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue