diff options
| author | Tom Rini <trini@ti.com> | 2012-09-18 14:56:31 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-18 14:56:31 -0700 |
| commit | 49b3962d2021867924f9fc04288f486abb501d87 (patch) | |
| tree | 3426ca9088f8b1b27653d8df42fb0057c024d71c /drivers | |
| parent | 7ee46cebcbee82e3522b84a82041e4aa86760e40 (diff) | |
| parent | db1fc7d28e8947c402149ded4597970fdb3e5571 (diff) | |
| download | u-boot-imx-49b3962d2021867924f9fc04288f486abb501d87.zip u-boot-imx-49b3962d2021867924f9fc04288f486abb501d87.tar.gz u-boot-imx-49b3962d2021867924f9fc04288f486abb501d87.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/mpc8xxx_spi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 44ab39d..4e46041 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -124,6 +124,8 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, * len > 16 0 */ + spi->mode &= ~SPI_MODE_EN; + if (bitlen <= 16) { if (bitlen <= 4) spi->mode = (spi->mode & 0xff0fffff) | @@ -138,6 +140,8 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, dout += 4; } + spi->mode |= SPI_MODE_EN; + spi->tx = tmpdout; /* Write the data out */ debug("*** spi_xfer: ... %08x written\n", tmpdout); |