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/broadcom/cygnus | |
| parent | 0dba0254ea31eca41fdef88783f1dd192ac6fa56 (diff) | |
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/broadcom/cygnus')
| -rw-r--r-- | src/soc/broadcom/cygnus/spi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/soc/broadcom/cygnus/spi.c b/src/soc/broadcom/cygnus/spi.c index 13b69765b2..810f2c266c 100644 --- a/src/soc/broadcom/cygnus/spi.c +++ b/src/soc/broadcom/cygnus/spi.c @@ -76,9 +76,6 @@ /* QSPI private data */ struct qspi_priv { - /* Slave entry */ - struct spi_slave slave; - /* Specified SPI parameters */ unsigned int max_hz; unsigned int spi_mode; @@ -94,16 +91,19 @@ struct qspi_priv { static struct qspi_priv qspi_slave; -/* Macro to get the private data */ -#define to_qspi_slave(s) container_of(s, struct qspi_priv, slave) +static struct qspi_priv *to_qspi_slave(const struct spi_slave *slave) +{ + return &qspi_slave; +} -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) { struct qspi_priv *priv = &qspi_slave; unsigned int spbr; - priv->slave.bus = bus; - priv->slave.cs = cs; + slave->bus = bus; + slave->cs = cs; + priv->max_hz = QSPI_MAX_HZ; priv->spi_mode = QSPI_MODE; priv->reg = (void *)(IPROC_QSPI_BASE); @@ -129,7 +129,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) (8 << 2) | /* 8 bits per word */ (priv->spi_mode & 3)); /* mode: CPOL / CPHA */ - return &priv->slave; + return 0; } static int mspi_enable(struct qspi_priv *priv) |