diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2017-05-15 14:35:15 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2017-05-19 21:21:47 +0200 |
| commit | 30221b45e02f0be8940debd8ad5690c77d6a97a6 (patch) | |
| tree | 0771086cabe7259abef22d80a29377d2661bc795 /src/soc/intel/common/block/fast_spi | |
| parent | fc1a123aa7392fe7900b466e6a6f089733fec1ee (diff) | |
| download | coreboot-30221b45e02f0be8940debd8ad5690c77d6a97a6.tar.xz | |
drivers/spi/spi_flash: Pass in flash structure to fill in probe
Instead of making all SPI drivers allocate space for a spi_flash
structure and fill it in, udpate the API to allow callers to pass in a
spi_flash structure that can be filled by the flash drivers as
required. This also cleans up the interface so that the callers can
maintain and free the space for spi_flash structure as required.
BUG=b:38330715
Change-Id: If6f1b403731466525c4690777d9b32ce778eb563
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19705
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/common/block/fast_spi')
| -rw-r--r-- | src/soc/intel/common/block/fast_spi/fast_spi_flash.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c index 96a808d423..9f973b91ef 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c +++ b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c @@ -169,9 +169,6 @@ static size_t get_xfer_len(const struct spi_flash *flash, uint32_t addr, } -/* Flash device operations. */ -static struct spi_flash boot_flash CAR_GLOBAL; - static int fast_spi_flash_erase(const struct spi_flash *flash, uint32_t offset, size_t len) { @@ -283,14 +280,12 @@ static int fast_spi_flash_status(const struct spi_flash *flash, * The size of the flash component is always taken from density field in the * SFDP table. FLCOMP.C0DEN is no longer used by the Flash Controller. */ -struct spi_flash *spi_flash_programmer_probe(struct spi_slave *dev, int force) +int spi_flash_programmer_probe(struct spi_slave *dev, + int force, struct spi_flash *flash) { BOILERPLATE_CREATE_CTX(ctx); - struct spi_flash *flash; uint32_t flash_bits; - flash = car_get_var_ptr(&boot_flash); - /* * bytes = (bits + 1) / 8; * But we need to do the addition in a way which doesn't overflow for @@ -317,7 +312,7 @@ struct spi_flash *spi_flash_programmer_probe(struct spi_slave *dev, int force) flash->internal_read = fast_spi_flash_read; flash->internal_status = fast_spi_flash_status; - return flash; + return 0; } int spi_flash_get_fpr_info(struct fpr_info *info) |