diff options
| author | Varadarajan Narayanan | 2017-07-28 08:52:51 +0200 |
|---|---|---|
| committer | Mark Brown | 2017-08-08 13:15:14 +0200 |
| commit | ce00bab3187f9fc1afac07914959bff0c52547c2 (patch) | |
| tree | e3e93b1fcadc0ae90776e8d3de906e104123cba8 /drivers/spi/spi-qup.c | |
| parent | spi: qup: Add completion timeout (diff) | |
| download | kernel-qcow2-linux-ce00bab3187f9fc1afac07914959bff0c52547c2.tar.gz kernel-qcow2-linux-ce00bab3187f9fc1afac07914959bff0c52547c2.tar.xz kernel-qcow2-linux-ce00bab3187f9fc1afac07914959bff0c52547c2.zip | |
spi: qup: Place the QUP in run mode before DMA
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-qup.c')
| -rw-r--r-- | drivers/spi/spi-qup.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index fdd34c3ce426..f1aa5c15d180 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -343,6 +343,14 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer, else if (xfer->tx_buf) tx_done = spi_qup_dma_done; + /* before issuing the descriptors, set the QUP to run */ + ret = spi_qup_set_state(qup, QUP_STATE_RUN); + if (ret) { + dev_warn(qup->dev, "%s(%d): cannot set RUN state\n", + __func__, __LINE__); + return ret; + } + if (xfer->rx_buf) { ret = spi_qup_prep_sg(master, xfer, DMA_DEV_TO_MEM, rx_done); if (ret) @@ -385,6 +393,13 @@ static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer, spi_qup_fifo_write(qup, xfer); + ret = spi_qup_set_state(qup, QUP_STATE_RUN); + if (ret) { + dev_warn(qup->dev, "%s(%d): cannot set RUN state\n", + __func__, __LINE__); + return ret; + } + if (!wait_for_completion_timeout(&qup->done, timeout)) return -ETIMEDOUT; |