diff mbox

[05/15] spi: qup: Place the QUP in run mode before DMA transactions

Message ID 1497603538-12750-6-git-send-email-varada@codeaurora.org (mailing list archive)
State New, archived
Headers show

Commit Message

Varadarajan Narayanan June 16, 2017, 8:58 a.m. UTC 
Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
---
 drivers/spi/spi-qup.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index d3ccf53..363bd43 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -336,6 +336,14 @@  static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer,
 	struct spi_qup *qup = spi_master_get_devdata(master);
 	int ret;
 
+	/* 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,
 					spi_qup_dma_done, &qup->rxc);
@@ -371,18 +379,24 @@  static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer,
 
 	ret = spi_qup_set_state(qup, QUP_STATE_RUN);
 	if (ret) {
-		dev_warn(qup->dev, "cannot set RUN state\n");
+		dev_warn(qup->dev, "%s(%d): cannot set RUN state\n");
 		return ret;
 	}
 
 	ret = spi_qup_set_state(qup, QUP_STATE_PAUSE);
 	if (ret) {
-		dev_warn(qup->dev, "cannot set PAUSE state\n");
+		dev_warn(qup->dev, "%s(%d): cannot set PAUSE state\n");
 		return ret;
 	}
 
 	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");
+		return ret;
+	}
+
 	if (!wait_for_completion_timeout(&qup->done, timeout))
 		return -ETIMEDOUT;