summaryrefslogtreecommitdiff
path: root/src/soc/mediatek
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2017-05-15 14:35:15 -0700
committerFurquan Shaikh <furquan@google.com>2017-05-19 21:21:47 +0200
commit30221b45e02f0be8940debd8ad5690c77d6a97a6 (patch)
tree0771086cabe7259abef22d80a29377d2661bc795 /src/soc/mediatek
parentfc1a123aa7392fe7900b466e6a6f089733fec1ee (diff)
downloadcoreboot-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/mediatek')
-rw-r--r--src/soc/mediatek/mt8173/flash_controller.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/soc/mediatek/mt8173/flash_controller.c b/src/soc/mediatek/mt8173/flash_controller.c
index 09df1a47f7..29a1c2f9a7 100644
--- a/src/soc/mediatek/mt8173/flash_controller.c
+++ b/src/soc/mediatek/mt8173/flash_controller.c
@@ -228,24 +228,24 @@ static int nor_erase(const struct spi_flash *flash, u32 offset, size_t len)
return 0;
}
-struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force)
+int spi_flash_programmer_probe(struct spi_slave *spi,
+ int force, struct spi_flash *flash)
{
- static struct spi_flash flash;
static int done;
if (done)
- return &flash;
+ return 0;
write32(&mt8173_nor->wrprot, SFLASH_COMMAND_ENABLE);
- memcpy(&flash.spi, spi, sizeof(*spi));
- flash.name = "mt8173 flash controller";
- flash.internal_write = nor_write;
- flash.internal_erase = nor_erase;
- flash.internal_read = nor_read;
- flash.internal_status = 0;
- flash.sector_size = 0x1000;
- flash.erase_cmd = SECTOR_ERASE_CMD;
- flash.size = CONFIG_ROM_SIZE;
+ memcpy(&flash->spi, spi, sizeof(*spi));
+ flash->name = "mt8173 flash controller";
+ flash->internal_write = nor_write;
+ flash->internal_erase = nor_erase;
+ flash->internal_read = nor_read;
+ flash->internal_status = 0;
+ flash->sector_size = 0x1000;
+ flash->erase_cmd = SECTOR_ERASE_CMD;
+ flash->size = CONFIG_ROM_SIZE;
done = 1;
- return &flash;
+ return 0;
}