summaryrefslogtreecommitdiff
path: root/src/soc/rockchip
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2016-12-01 01:02:44 -0800
committerFurquan Shaikh <furquan@google.com>2016-12-05 03:28:06 +0100
commit36b81af9e8ecea2bf58aae9a421720ed10f61b82 (patch)
tree05e7329c67bf009531c12052db105ac55ce015b8 /src/soc/rockchip
parent0dba0254ea31eca41fdef88783f1dd192ac6fa56 (diff)
downloadcoreboot-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/rockchip')
-rw-r--r--src/soc/rockchip/common/spi.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/soc/rockchip/common/spi.c b/src/soc/rockchip/common/spi.c
index 8f45679dfc..85597f2b79 100644
--- a/src/soc/rockchip/common/spi.c
+++ b/src/soc/rockchip/common/spi.c
@@ -27,7 +27,6 @@
#include <timer.h>
struct rockchip_spi_slave {
- struct spi_slave slave;
struct rockchip_spi *regs;
};
@@ -37,30 +36,24 @@ struct rockchip_spi_slave {
static struct rockchip_spi_slave rockchip_spi_slaves[] = {
{
- .slave = { .bus = 0, },
.regs = (void *)SPI0_BASE,
},
{
- .slave = { .bus = 1, },
.regs = (void *)SPI1_BASE,
},
{
- .slave = { .bus = 2, },
.regs = (void *)SPI2_BASE,
},
#ifdef SPI3_BASE
{
- .slave = { .bus = 3, },
.regs = (void *)SPI3_BASE,
},
#ifdef SPI4_BASE
{
- .slave = { .bus = 4, },
.regs = (void *)SPI4_BASE,
},
#ifdef SPI5_BASE
{
- .slave = { .bus = 5, },
.regs = (void *)SPI5_BASE,
},
#endif
@@ -70,13 +63,18 @@ static struct rockchip_spi_slave rockchip_spi_slaves[] = {
static struct rockchip_spi_slave *to_rockchip_spi(const struct spi_slave *slave)
{
- return container_of(slave, struct rockchip_spi_slave, slave);
+ assert(slave->bus < ARRAY_SIZE(rockchip_spi_slaves));
+ return &rockchip_spi_slaves[slave->bus];
}
-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)
{
- assert(bus >= 0 && bus < ARRAY_SIZE(rockchip_spi_slaves));
- return &(rockchip_spi_slaves[bus].slave);
+ assert(bus < ARRAY_SIZE(rockchip_spi_slaves));
+
+ slave->bus = bus;
+ slave->cs = cs;
+
+ return 0;
}
static void spi_cs_activate(const struct spi_slave *slave)