[PATCH 05/12] spi: imx: initialize usedma earlier
Sascha Hauer
s.hauer at pengutronix.de
Thu Feb 18 23:43:05 PST 2016
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 at 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
More information about the linux-arm-kernel
mailing list