sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
src/drivers/spi/spi_flash.c
View File

@ -350,7 +350,7 @@ int spi_flash_probe(unsigned int bus, unsigned int cs, struct spi_flash *flash)
int spi_flash_read(const struct spi_flash *flash, u32 offset, size_t len,
void *buf)
{
return flash->internal_read(flash, offset, len, buf);
return flash->ops->read(flash, offset, len, buf);
}
int spi_flash_write(const struct spi_flash *flash, u32 offset, size_t len,
@ -361,7 +361,7 @@ int spi_flash_write(const struct spi_flash *flash, u32 offset, size_t len,
if (spi_flash_volatile_group_begin(flash))
return -1;
ret = flash->internal_write(flash, offset, len, buf);
ret = flash->ops->write(flash, offset, len, buf);
if (spi_flash_volatile_group_end(flash))
return -1;
@ -376,7 +376,7 @@ int spi_flash_erase(const struct spi_flash *flash, u32 offset, size_t len)
if (spi_flash_volatile_group_begin(flash))
return -1;
ret = flash->internal_erase(flash, offset, len);
ret = flash->ops->erase(flash, offset, len);
if (spi_flash_volatile_group_end(flash))
return -1;
@ -386,7 +386,10 @@ int spi_flash_erase(const struct spi_flash *flash, u32 offset, size_t len)
int spi_flash_status(const struct spi_flash *flash, u8 *reg)
{
return flash->internal_status(flash, reg);
if (flash->ops->status)
return flash->ops->status(flash, reg);
return -1;
}
static uint32_t volatile_group_count CAR_GLOBAL;