From: Mark Brown <broonie@kernel.org>
To: Fabien Parent <fparent@baylibre.com>
Cc: Frode Isaksen <fisaksen@baylibre.com>,
Mark Brown <broonie@kernel.org>,
broonie@kernel.org, linux-spi@vger.kernel.org,
linux-kernel@vger.kernel.org, nsekhar@ti.com,
ptitiano@baylibre.com, khilman@baylibre.com,
linux-spi@vger.kernel.org
Subject: Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree
Date: Tue, 07 Mar 2017 15:22:07 +0100 [thread overview]
Message-ID: <E1clG07-0006mU-6x@finisterre> (raw)
In-Reply-To: <20170206145708.24356-2-fparent@baylibre.com>
The patch
spi: davinci: enable DMA when channels are defined in DT
has been applied to the spi tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 3e2e1258443ea97e40dfb4a3cf15108d17939066 Mon Sep 17 00:00:00 2001
From: Fabien Parent <fparent@baylibre.com>
Date: Thu, 23 Feb 2017 19:01:57 +0100
Subject: [PATCH] spi: davinci: enable DMA when channels are defined in DT
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
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 164cc719be54..1e24395a04f2 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.11.0
next prev parent reply other threads:[~2017-03-07 14:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-06 14:57 [PATCH 1/2] spi: davinci: Use SPI framework to handle DMA mapping Fabien Parent
2017-02-06 14:57 ` Fabien Parent
2017-02-06 14:57 ` [PATCH 2/2] spi: davinci: enable DMA when channels are defined in DT Fabien Parent
2017-02-06 14:57 ` Fabien Parent
2017-03-07 14:22 ` Mark Brown [this message]
2017-03-08 10:35 ` Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree Frode Isaksen
2017-03-08 10:35 ` Frode Isaksen
2017-03-08 12:43 ` Mark Brown
2017-03-10 10:24 ` Frode Isaksen
2017-03-13 16:43 ` Mark Brown
2017-02-06 16:48 ` [PATCH 1/2] spi: davinci: Use SPI framework to handle DMA mapping Mark Brown
2017-02-06 16:48 ` 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=E1clG07-0006mU-6x@finisterre \
--to=broonie@kernel.org \
--cc=fisaksen@baylibre.com \
--cc=fparent@baylibre.com \
--cc=khilman@baylibre.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=ptitiano@baylibre.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.