diff options
| author | Tom Rini <trini@ti.com> | 2013-03-20 14:55:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-20 14:55:10 -0400 |
| commit | 8b906a9f0b3fd0d4421e08c4fa62f61a01289611 (patch) | |
| tree | 049acc34fee9692c0c394b8d1697d97257c0a074 /drivers/spi/kirkwood_spi.c | |
| parent | 3c47f2f4871c345c20b9d986b11fec550ef6cc9f (diff) | |
| parent | 1e7133e99e27c4f02998e7eb87fa43424d48152b (diff) | |
| download | olio-uboot-2014.01-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.tar.xz olio-uboot-2014.01-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.zip | |
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/spi/kirkwood_spi.c')
| -rw-r--r-- | drivers/spi/kirkwood_spi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index de81064b9..caa91e3e8 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -49,13 +49,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - slave = malloc(sizeof(struct spi_slave)); + slave = spi_alloc_slave_base(bus, cs); if (!slave) return NULL; - slave->bus = bus; - slave->cs = cs; - writel(~KWSPI_CSN_ACT | KWSPI_SMEMRDY, &spireg->ctrl); /* calculate spi clock prescaller using max_hz */ |