From c28984d9ea08e7d995ef9fc8064c10ec0c0d9d77 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Sun, 20 Nov 2016 21:04:00 -0800 Subject: spi: Clean up SPI flash driver interface RW flag was added to spi_slave structure to get around a requirement on some AMD flash controllers that need to group together all spi volatile operations (write/erase). This rw flag is not a property or attribute of the SPI slave or controller. Thus, instead of saving it in spi_slave structure, clean up the SPI flash driver interface. This allows chipsets/mainboards (that require volatile operations to be grouped) to indicate beginning and end of such grouped operations. New user APIs are added to allow users to perform probe, read, write, erase, volatile group begin and end operations. Callbacks defined in spi_flash structure are expected to be used only by the SPI flash driver. Any chipset that requires grouping of volatile operations can select the newly added Kconfig option SPI_FLASH_HAS_VOLATILE_GROUP and define callbacks for chipset_volatile_group_{begin,end}. spi_claim_bus/spi_release_bus calls have been removed from the SPI flash chip drivers which end up calling do_spi_flash_cmd since it already has required calls for claiming and releasing SPI bus before performing a read/write operation. BUG=None BRANCH=None TEST=Compiles successfully. Change-Id: Idfc052e82ec15b6c9fa874cee7a61bd06e923fbf Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/17462 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/soc/rockchip/common/spi.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'src/soc/rockchip') diff --git a/src/soc/rockchip/common/spi.c b/src/soc/rockchip/common/spi.c index 57e9ca117e..3666de39d1 100644 --- a/src/soc/rockchip/common/spi.c +++ b/src/soc/rockchip/common/spi.c @@ -37,45 +37,30 @@ struct rockchip_spi_slave { static struct rockchip_spi_slave rockchip_spi_slaves[] = { { - .slave = { - .bus = 0, - .rw = SPI_READ_FLAG | SPI_WRITE_FLAG, - }, + .slave = { .bus = 0, }, .regs = (void *)SPI0_BASE, }, { - .slave = {.bus = 1, .rw = SPI_READ_FLAG,}, + .slave = { .bus = 1, }, .regs = (void *)SPI1_BASE, }, { - .slave = { - .bus = 2, - .rw = SPI_READ_FLAG | SPI_WRITE_FLAG, - }, + .slave = { .bus = 2, }, .regs = (void *)SPI2_BASE, }, #ifdef SPI3_BASE { - .slave = { - .bus = 3, - .rw = SPI_READ_FLAG | SPI_WRITE_FLAG, - }, + .slave = { .bus = 3, }, .regs = (void *)SPI3_BASE, }, #ifdef SPI4_BASE { - .slave = { - .bus = 4, - .rw = SPI_READ_FLAG | SPI_WRITE_FLAG, - }, + .slave = { .bus = 4, }, .regs = (void *)SPI4_BASE, }, #ifdef SPI5_BASE { - .slave = { - .bus = 5, - .rw = SPI_READ_FLAG | SPI_WRITE_FLAG, - }, + .slave = { .bus = 5, }, .regs = (void *)SPI5_BASE, }, #endif -- cgit v1.2.3