openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: rspi: SPI DMA core needs both RX and TX DMA to function 

The SPI DMA core framework needs both RX and TX DMA to function.  As a
preparation for converting the driver to use this framework, fall back to
PIO if no DMA channel or only one DMA channel is available.

This affects only RSPI, which could do DMA transfers for TX-only before.
RSPI-RZ and QSPI (at least for Single SPI Transfers) will need both RX and
TX DMA anyway.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Geert Uytterhoeven 2014-06-02 15:38:11 +02:00 committed by Mark Brown
parent fcdc49ae53
commit 5f338d0ce0
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/spi/spi-rspi.c
View File

@ -640,10 +640,6 @@ static int rspi_send_receive_dma(struct rspi_data *rspi, struct spi_transfer *t)
static int rspi_is_dma(const struct rspi_data *rspi, struct spi_transfer *t)
{
/* If the module receives data by DMAC, it also needs TX DMAC */
if (t->rx_buf)
return rspi->chan_tx && rspi->chan_rx;
if (rspi->chan_tx)
return 1;
@ -985,29 +981,25 @@ static int rspi_request_dma(struct device *dev, struct rspi_data *rspi,
{
const struct rspi_plat_data *rspi_pd = dev_get_platdata(dev);
if (!rspi_pd)
if (!rspi_pd || !rspi_pd->dma_rx_id || !rspi_pd->dma_tx_id)
return 0; /* The driver assumes no error. */
/* If the module receives data by DMAC, it also needs TX DMAC */
if (rspi_pd->dma_rx_id && rspi_pd->dma_tx_id) {
rspi->chan_rx = rspi_request_dma_chan(dev, DMA_DEV_TO_MEM,
rspi_pd->dma_rx_id,
res->start + RSPI_SPDR);
if (!rspi->chan_rx)
return -ENODEV;
rspi->chan_rx = rspi_request_dma_chan(dev, DMA_DEV_TO_MEM,
rspi_pd->dma_rx_id,
res->start + RSPI_SPDR);
if (!rspi->chan_rx)
return -ENODEV;
dev_info(dev, "Use DMA when rx.\n");
}
if (rspi_pd->dma_tx_id) {
rspi->chan_tx = rspi_request_dma_chan(dev, DMA_MEM_TO_DEV,
rspi_pd->dma_tx_id,
res->start + RSPI_SPDR);
if (!rspi->chan_tx)
return -ENODEV;
dev_info(dev, "Use DMA when tx\n");
rspi->chan_tx = rspi_request_dma_chan(dev, DMA_MEM_TO_DEV,
rspi_pd->dma_tx_id,
res->start + RSPI_SPDR);
if (!rspi->chan_tx) {
dma_release_channel(rspi->chan_rx);
rspi->chan_rx = NULL;
return -ENODEV;
}
dev_info(dev, "DMA available");
return 0;
}