From d2fb6ae813880b8fd1b3983e0e61c7e51fb9b20b Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 17 Nov 2016 20:38:07 -0800 Subject: 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 Reviewed-on: https://review.coreboot.org/17465 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/soc/intel/apollolake/spi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/soc/intel/apollolake') diff --git a/src/soc/intel/apollolake/spi.c b/src/soc/intel/apollolake/spi.c index 018572cfab..4da292ac85 100644 --- a/src/soc/intel/apollolake/spi.c +++ b/src/soc/intel/apollolake/spi.c @@ -354,7 +354,7 @@ static struct spi_flash boot_flash CAR_GLOBAL; * 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. */ -static struct spi_flash *nuclear_flash_probe(struct spi_slave *spi) +struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force) { BOILERPLATE_CREATE_CTX(ctx); struct spi_flash *flash; @@ -403,8 +403,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) slave->bus = bus; slave->cs = cs; - slave->programmer_specific_probe = nuclear_flash_probe; - slave->force_programmer_specific = 1; return slave; } -- cgit v1.2.3