public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: fisaksen@baylibre.com (Frode Isaksen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/6] spi: davinci: enable DMA when channels are defined in DT
Date: Thu, 23 Feb 2017 19:01:57 +0100	[thread overview]
Message-ID: <1487872921-26628-3-git-send-email-fisaksen@baylibre.com> (raw)
In-Reply-To: <1487872921-26628-1-git-send-email-fisaksen@baylibre.com>

From: Fabien Parent <fparent@baylibre.com>

When booting with DT the SPI driver is always using
the SPI_IO_TYPE_INTR mode to transfer data even if DMA channels are
defined in the DT.

This commit changes the behaviour to select the SPI_IO_TYPE_DMA mode
if DMA channels are defined in the DT and will keep SPI_IO_TYPE_INTR
if the channels are not defined in it.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Signed-off-by: Frode Isaksen <fisaksen@baylibre.com>
---
 drivers/spi/spi-davinci.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 164cc71..1e24395 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -389,6 +389,7 @@ static int davinci_spi_of_setup(struct spi_device *spi)
 {
 	struct davinci_spi_config *spicfg = spi->controller_data;
 	struct device_node *np = spi->dev.of_node;
+	struct davinci_spi *dspi = spi_master_get_devdata(spi->master);
 	u32 prop;
 
 	if (spicfg == NULL && np) {
@@ -400,6 +401,9 @@ static int davinci_spi_of_setup(struct spi_device *spi)
 		if (!of_property_read_u32(np, "ti,spi-wdelay", &prop))
 			spicfg->wdelay = (u8)prop;
 		spi->controller_data = spicfg;
+
+		if (dspi->dma_rx && dspi->dma_tx)
+			spicfg->io_type = SPI_IO_TYPE_DMA;
 	}
 
 	return 0;
-- 
2.7.4

  parent reply	other threads:[~2017-02-23 18:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-23 18:01 [PATCH v3 0/6] Enable DMA for daVinci SPI controller Frode Isaksen
2017-02-23 18:01 ` [PATCH v3 1/6] spi: davinci: Use SPI framework to handle DMA mapping Frode Isaksen
2017-03-07 14:22   ` Applied "spi: davinci: Use SPI framework to handle DMA mapping" to the spi tree Mark Brown
2017-02-23 18:01 ` Frode Isaksen [this message]
2017-02-23 18:01 ` [PATCH v3 3/6] spi: davinci: use rx buffer as dummy tx buffer Frode Isaksen
2017-03-15 19:35   ` Mark Brown
2017-02-23 18:01 ` [PATCH v3 4/6] spi: davinci: do not use DMA if transfer length is less than 16 Frode Isaksen
2017-03-15 19:37   ` Applied "spi: davinci: do not use DMA if transfer length is less than 16" to the spi tree Mark Brown
2017-02-23 18:02 ` [PATCH v3 5/6] spi: davinci: do not use DMA for vmalloc'ed buffers Frode Isaksen
2017-03-15 19:37   ` Applied "spi: davinci: do not use DMA for vmalloc'ed buffers" to the spi tree Mark Brown
2017-02-23 18:02 ` [PATCH v3 6/6] spi: loopback-test: add option to use vmalloc'ed buffers Frode Isaksen
2017-03-16 14:11   ` Applied "spi: loopback-test: add option to use vmalloc'ed buffers" to the spi tree Mark Brown

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=1487872921-26628-3-git-send-email-fisaksen@baylibre.com \
    --to=fisaksen@baylibre.com \
    --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