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/mxs_spi.c | |
| parent | 3c47f2f4871c345c20b9d986b11fec550ef6cc9f (diff) | |
| parent | 1e7133e99e27c4f02998e7eb87fa43424d48152b (diff) | |
| download | u-boot-imx-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.zip u-boot-imx-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.tar.gz u-boot-imx-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.tar.bz2 | |
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/spi/mxs_spi.c')
| -rw-r--r-- | drivers/spi/mxs_spi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index ffa3c1d..aa999f9 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -77,15 +77,13 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; } - mxs_slave = calloc(sizeof(struct mxs_spi_slave), 1); + mxs_slave = spi_alloc_slave(struct mxs_spi_slave, bus, cs); if (!mxs_slave) return NULL; if (mxs_dma_init_channel(MXS_DMA_CHANNEL_AHB_APBH_SSP0 + bus)) goto err_init; - mxs_slave->slave.bus = bus; - mxs_slave->slave.cs = cs; mxs_slave->max_khz = max_hz / 1000; mxs_slave->mode = mode; mxs_slave->regs = mxs_ssp_regs_by_bus(bus); |