summaryrefslogtreecommitdiffstats
path: root/src/include/spi-generic.h
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2016-11-17 20:38:07 -0800
committerFurquan Shaikh <furquan@google.com>2016-11-22 17:37:57 +0100
commitd2fb6ae813880b8fd1b3983e0e61c7e51fb9b20b (patch)
treece8dcf60dd013444448e2be2ef6d52c7179ceac2 /src/include/spi-generic.h
parentdc34fb60b4151a7fad3882cc85dac4379f2d8dd8 (diff)
downloadcoreboot-d2fb6ae813880b8fd1b3983e0e61c7e51fb9b20b.tar.gz
coreboot-d2fb6ae813880b8fd1b3983e0e61c7e51fb9b20b.tar.bz2
coreboot-d2fb6ae813880b8fd1b3983e0e61c7e51fb9b20b.zip
spi: Get rid of flash_programmer_probe in spi_slave structure
flash_programmer_probe is a property of the spi flash driver and does not belong in the spi_slave structure. Thus, make spi_flash_programmer_probe a callback from the spi_flash_probe function. Logic still remains the same as before (order matters): 1. Try spi_flash_programmer_probe without force option 2. Try generic flash probing 3. Try spi_flash_programmer_probe with force option If none of the above steps work, fail probing. Flash controller is expected to honor force option to decide whether to perform specialized probing or to defer to generic probing. BUG=None BRANCH=None TEST=Compiles successfully Change-Id: I4163593eea034fa044ec2216e56d0ea3fbc86c7d Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/17465 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/include/spi-generic.h')
-rw-r--r--src/include/spi-generic.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h
index eacb092d1c2f..e57f56d88cc0 100644
--- a/src/include/spi-generic.h
+++ b/src/include/spi-generic.h
@@ -27,16 +27,12 @@
/*-----------------------------------------------------------------------
* Representation of a SPI slave, i.e. what we're communicating with.
*
- * Drivers are expected to extend this with controller-specific data.
- *
* bus: ID of the bus that the slave is attached to.
* cs: ID of the chip select connected to the slave.
*/
struct spi_slave {
unsigned int bus;
unsigned int cs;
- int force_programmer_specific;
- struct spi_flash * (*programmer_specific_probe) (struct spi_slave *spi);
};
/*-----------------------------------------------------------------------