aboutsummaryrefslogtreecommitdiff
path: root/src/include/spi_flash.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/include/spi_flash.h
parentfc1a123aa7392fe7900b466e6a6f089733fec1ee (diff)
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/include/spi_flash.h')
-rw-r--r--src/include/spi_flash.h26
1 files changed, 24 insertions, 2 deletions
diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h
index a72a13e0f8..3b18717a86 100644
--- a/src/include/spi_flash.h
+++ b/src/include/spi_flash.h
@@ -50,14 +50,36 @@ struct spi_flash {
void lb_spi_flash(struct lb_header *header);
/* SPI Flash Driver Public API */
-struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs);
+
+/*
+ * Probe for SPI flash chip on given SPI bus and chip select and fill info in
+ * spi_flash structure.
+ *
+ * Params:
+ * bus = SPI Bus # for the flash chip
+ * cs = Chip select # for the flash chip
+ * flash = Pointer to spi flash structure that needs to be filled
+ *
+ * Return value:
+ * 0 = success
+ * non-zero = error
+ */
+int spi_flash_probe(unsigned int bus, unsigned int cs, struct spi_flash *flash);
/*
* Specialized probing performed by platform. This is a weak function which can
* be overriden by platform driver.
+ *
+ * Params:
* spi = Pointer to spi_slave structure.
* force = Indicates if the platform driver can skip specialized probing.
+ * flash = Pointer to spi_flash structure that needs to be filled.
+ *
+ * Return value:
+ * 0 = success
+ * non-zero = error
*/
-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);
/* All the following functions return 0 on success and non-zero on error. */
int spi_flash_read(const struct spi_flash *flash, u32 offset, size_t len,