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>

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 164cc719be54b5d03c05139cdf3809fc35c1e0b8..1e24395a04f210f85ec31e59c6e4f80e24eb6c2c 100644 (file)
--- 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;