drivers/spi/spi_flash: Move flash ops to spi_flash_ops structure

Define a new spi_flash_ops structure, move all spi flash operations to
this structure and add a pointer to this structure in struct spi_flash.

BUG=b:38330715

Change-Id: I550cc4556fc4b63ebc174a7e2fde42251fe56052
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19757
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh
2017-05-17 17:26:01 -07:00
committed by Furquan Shaikh
parent a1491574ef
commit e2fc5e25f2
15 changed files with 170 additions and 101 deletions

View File

@ -109,6 +109,16 @@ out:
return ret;
}
static const struct spi_flash_ops spi_flash_ops = {
.write = amic_write,
.erase = spi_flash_cmd_erase,
#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ)
.read = spi_flash_cmd_read_slow,
#else
.read = spi_flash_cmd_read_fast,
#endif
};
int spi_flash_probe_amic(const struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
@ -137,13 +147,7 @@ int spi_flash_probe_amic(const struct spi_slave *spi, u8 *idcode,
params->nr_blocks;
flash->erase_cmd = CMD_A25_SE;
flash->internal_write = amic_write;
flash->internal_erase = spi_flash_cmd_erase;
#if CONFIG_SPI_FLASH_NO_FAST_READ
flash->internal_read = spi_flash_cmd_read_slow;
#else
flash->internal_read = spi_flash_cmd_read_fast;
#endif
flash->ops = &spi_flash_ops;
return 0;
}