summaryrefslogtreecommitdiff
path: root/src/drivers/spi/spi_flash_internal.h
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/drivers/spi/spi_flash_internal.h
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/drivers/spi/spi_flash_internal.h')
-rw-r--r--src/drivers/spi/spi_flash_internal.h34
1 files changed, 22 insertions, 12 deletions
diff --git a/src/drivers/spi/spi_flash_internal.h b/src/drivers/spi/spi_flash_internal.h
index 9b517238b2..4ad0b09ca3 100644
--- a/src/drivers/spi/spi_flash_internal.h
+++ b/src/drivers/spi/spi_flash_internal.h
@@ -64,17 +64,27 @@ int spi_flash_cmd_erase(const struct spi_flash *flash, u32 offset, size_t len);
int spi_flash_cmd_status(const struct spi_flash *flash, u8 *reg);
/* Manufacturer-specific probe functions */
-struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_flash_probe_gigadevice(struct spi_slave *spi,
- u8 *idcode);
-struct spi_flash *spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode);
-struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode);
+int spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_gigadevice(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
+int spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode,
+ struct spi_flash *flash);
#endif /* SPI_FLASH_INTERNAL_H */