diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-06-02 15:38:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 15:49:32 +0100 |
| commit | 32c64261c6f50a4e71ec7546f7e2f48eba91c985 (patch) | |
| tree | f18b47b743b7f867d581743278beee578e4ba044 | |
| parent | 5f684c34fc82be84ece158aa5c5c7c5072daa9a0 (diff) | |
| download | op-kernel-dev-32c64261c6f50a4e71ec7546f7e2f48eba91c985.zip op-kernel-dev-32c64261c6f50a4e71ec7546f7e2f48eba91c985.tar.gz | |
spi: rspi: Do not call rspi_receive_init() for TX-only
Since commit 8449fd76deb9ac67a15a6fb8ead7bb4595d019d2 ("spi: rspi: Merge
rspi_send_pio() and rspi_receive_pio()"), rspi_receive_init() is called
for transmit-only transfers too, while this is not needed.
Only call rspi_receive_init() when receiving, to preserve behavior on
RSPI on SH.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/spi/spi-rspi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index d04a4ac..57beda2 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -726,13 +726,13 @@ static int rspi_transfer_out_in(struct rspi_data *rspi, u8 *rx_buf = xfer->rx_buf; u8 spcr, data; - rspi_receive_init(rspi); - spcr = rspi_read8(rspi, RSPI_SPCR); - if (rx_buf) + if (rx_buf) { + rspi_receive_init(rspi); spcr &= ~SPCR_TXMD; - else + } else { spcr |= SPCR_TXMD; + } rspi_write8(rspi, spcr, RSPI_SPCR); while (remain > 0) { |
