From 36b81af9e8ecea2bf58aae9a421720ed10f61b82 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 1 Dec 2016 01:02:44 -0800 Subject: 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 Reviewed-on: https://review.coreboot.org/17683 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/soc/marvell/armada38x/spi.c | 8 ++------ src/soc/marvell/bg4cd/spi.c | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/soc/marvell') diff --git a/src/soc/marvell/armada38x/spi.c b/src/soc/marvell/armada38x/spi.c index af0a279133..8f9686793f 100644 --- a/src/soc/marvell/armada38x/spi.c +++ b/src/soc/marvell/armada38x/spi.c @@ -153,8 +153,6 @@ static MV_SPI_TYPE_INFO spi_types[] = { {.en16_bit = MV_TRUE, param define end *******************************************************************************/ -static struct spi_slave s_spi; - static int mv_spi_baud_rate_set(unsigned char spi_id, unsigned int serial_baud_rate); static void mv_spi_cs_deassert(unsigned char spi_id); @@ -444,14 +442,12 @@ static int mrvl_spi_xfer(const struct spi_slave *slave, return 0; } -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 spi_slave *slave = &s_spi; - slave->bus = bus; slave->cs = cs; mv_spi_sys_init(bus, cs, CONFIG_SF_DEFAULT_SPEED); - return slave; + return 0; } int spi_claim_bus(const struct spi_slave *slave) diff --git a/src/soc/marvell/bg4cd/spi.c b/src/soc/marvell/bg4cd/spi.c index 9a999b049c..54161bcf33 100644 --- a/src/soc/marvell/bg4cd/spi.c +++ b/src/soc/marvell/bg4cd/spi.c @@ -15,9 +15,9 @@ #include #include -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) { - return NULL; + return -1; } int spi_claim_bus(const struct spi_slave *slave) -- cgit v1.2.3