diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2016-12-01 01:02:44 -0800 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2016-12-05 03:28:06 +0100 |
| commit | 36b81af9e8ecea2bf58aae9a421720ed10f61b82 (patch) | |
| tree | 05e7329c67bf009531c12052db105ac55ce015b8 /src/soc/intel/apollolake/spi.c | |
| parent | 0dba0254ea31eca41fdef88783f1dd192ac6fa56 (diff) | |
| download | coreboot-36b81af9e8ecea2bf58aae9a421720ed10f61b82.tar.xz | |
spi: Pass pointer to spi_slave structure in spi_setup_slave
For spi_setup_slave, instead of making the platform driver return a
pointer to spi_slave structure, pass in a structure pointer that can be
filled in by the driver as required. This removes the need for platform
drivers to maintain a slave structure in data/CAR section.
BUG=chrome-os-partner:59832
BRANCH=None
TEST=Compiles successfully
Change-Id: Ia15a4f88ef4dcfdf616bb1c22261e7cb642a7573
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/17683
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/apollolake/spi.c')
| -rw-r--r-- | src/soc/intel/apollolake/spi.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/soc/intel/apollolake/spi.c b/src/soc/intel/apollolake/spi.c index 6e873f45c8..ca56702dcf 100644 --- a/src/soc/intel/apollolake/spi.c +++ b/src/soc/intel/apollolake/spi.c @@ -344,7 +344,6 @@ static int nuclear_spi_status(const struct spi_flash *flash, uint8_t *reg) return ret; } -static struct spi_slave boot_spi CAR_GLOBAL; static struct spi_flash boot_flash CAR_GLOBAL; /* @@ -391,20 +390,18 @@ struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force) return flash; } -struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) +int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) { BOILERPLATE_CREATE_CTX(ctx); /* This is special hardware. We expect bus 0 and CS line 0 here. */ if ((bus != 0) || (cs != 0)) - return NULL; - - struct spi_slave *slave = car_get_var_ptr(&boot_spi); + return -1; slave->bus = bus; slave->cs = cs; - return slave; + return 0; } int spi_read_status(uint8_t *status) |