diff options
| author |   Fabien Parent <fparent@baylibre.com> | 2017-02-23 19:01:57 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-03-07 15:10:25 +0100 |
| commit | 3e2e1258443ea97e40dfb4a3cf15108d17939066 (patch) | |
| tree | 33272006c2169753756f74def8702794ad8f9ab7 /drivers/spi | |
| parent | spi: davinci: Use SPI framework to handle DMA mapping (diff) | |
| download | linux-dev-3e2e1258443ea97e40dfb4a3cf15108d17939066.tar.xz linux-dev-3e2e1258443ea97e40dfb4a3cf15108d17939066.zip | |
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>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-davinci.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |