linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/13] spi: imx: initialize usedma earlier
Date: Wed, 17 Feb 2016 14:28:51 +0100	[thread overview]
Message-ID: <1455715739-25161-6-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1455715739-25161-1-git-send-email-s.hauer@pengutronix.de>

So that the SoC specific config function can know if we will do
DMA or not. Will be needed in following patches.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/spi/spi-imx.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 5a48d07..7047453 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -815,6 +815,11 @@ static int spi_imx_setupxfer(struct spi_device *spi,
 		spi_imx->tx = spi_imx_buf_tx_u32;
 	}
 
+	if (spi_imx_can_dma(spi_imx->bitbang.master, spi, t))
+		spi_imx->usedma = 1;
+	else
+		spi_imx->usedma = 0;
+
 	spi_imx->devtype_data->config(spi_imx, &config);
 
 	return 0;
@@ -1038,14 +1043,10 @@ static int spi_imx_transfer(struct spi_device *spi,
 {
 	struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
 
-	if (spi_imx->bitbang.master->can_dma &&
-	    spi_imx_can_dma(spi_imx->bitbang.master, spi, transfer)) {
-		spi_imx->usedma = true;
+	if (spi_imx->usedma)
 		return spi_imx_dma_transfer(spi_imx, transfer);
-	}
-	spi_imx->usedma = false;
-
-	return spi_imx_pio_transfer(spi, transfer);
+	else
+		return spi_imx_pio_transfer(spi, transfer);
 }
 
 static int spi_imx_setup(struct spi_device *spi)
-- 
2.7.0

  parent reply	other threads:[~2016-02-17 13:28 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-17 13:28 [PATCH] i.MX SPI DMA cleanup Sascha Hauer
2016-02-17 13:28 ` [PATCH 01/13] spi: imx: allow only WML aligned transfers to use DMA Sascha Hauer
2016-02-17 14:16   ` Mark Brown
2016-02-17 15:01     ` Sascha Hauer
2016-02-17 16:05       ` Mark Brown
2016-02-17 13:28 ` [PATCH 02/13] spi: imx: use proper dev_* functions for driver messages Sascha Hauer
2016-02-17 13:28 ` [PATCH 03/13] spi: imx: replace fixed timeout with calculated Sascha Hauer
2016-02-17 14:22   ` Mark Brown
2016-02-17 13:28 ` [PATCH 04/13] spi: imx: drop fallback to PIO Sascha Hauer
2016-02-17 13:28 ` Sascha Hauer [this message]
2016-02-17 13:28 ` [PATCH 06/13] spi: imx: drop unnecessary read/modify/write Sascha Hauer
2016-02-17 13:28 ` [PATCH 07/13] spi: imx: drop unncessary dma_is_inited variable Sascha Hauer
2016-02-17 13:28 ` [PATCH 08/13] spi: imx: add support for all SPI word width for DMA Sascha Hauer
2016-02-17 13:28 ` [PATCH 09/13] spi: imx: remove unnecessary bit clearing in mx51_ecspi_config Sascha Hauer
2016-02-17 13:28 ` [PATCH 10/13] spi: imx: make some register defines simpler Sascha Hauer
2016-02-17 13:28 ` [PATCH 11/13] spi: imx: set MX51_ECSPI_CTRL_SMC bit in setup function Sascha Hauer
2016-02-17 13:28 ` [PATCH 12/13] spi: imx: drop bogus tests for rx/tx bufs in DMA transfer Sascha Hauer
2016-02-17 13:28 ` [PATCH 13/13] ARM: dts: imx6: Use correct SDMA script for SPI cores Sascha Hauer
2016-02-17 13:42 ` [PATCH] i.MX SPI DMA cleanup Dirk Behme
2016-02-17 13:54   ` Sascha Hauer
2016-02-17 14:10     ` Dirk Behme
2016-02-17 14:59       ` Sascha Hauer
2016-02-17 15:33         ` Dirk Behme
2016-02-17 15:40           ` Fabio Estevam
2016-02-18 14:47 ` Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455715739-25161-6-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).