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

spi: dw-mid: convert to use DMAengine wrappers 

Instead of direct dereference to dmaengine callbacks we are going to use
DMAengine wrappers.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2014-10-02 16:31:08 +03:00 committed by Mark Brown
parent 15ee3be78b
commit 2a28529944
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/spi/spi-dw-mid.c
View File

@ -113,8 +113,7 @@ static void dw_spi_dma_done(void *arg)
static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change) static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
{ {
struct dma_async_tx_descriptor *txdesc = NULL, *rxdesc = NULL; struct dma_async_tx_descriptor *txdesc, *rxdesc;
struct dma_chan *txchan, *rxchan;
struct dma_slave_config txconf, rxconf; struct dma_slave_config txconf, rxconf;
u16 dma_ctrl = 0; u16 dma_ctrl = 0;
@ -132,8 +131,6 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
} }
dws->dma_chan_done = 0; dws->dma_chan_done = 0;
txchan = dws->txchan;
rxchan = dws->rxchan;
/* 2. Prepare the TX dma transfer */ /* 2. Prepare the TX dma transfer */
txconf.direction = DMA_MEM_TO_DEV; txconf.direction = DMA_MEM_TO_DEV;
@ -143,14 +140,13 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
txconf.dst_addr_width = dws->dma_width; txconf.dst_addr_width = dws->dma_width;
txconf.device_fc = false; txconf.device_fc = false;
txchan->device->device_control(txchan, DMA_SLAVE_CONFIG, dmaengine_slave_config(dws->txchan, &txconf);
(unsigned long) &txconf);
memset(&dws->tx_sgl, 0, sizeof(dws->tx_sgl)); memset(&dws->tx_sgl, 0, sizeof(dws->tx_sgl));
dws->tx_sgl.dma_address = dws->tx_dma; dws->tx_sgl.dma_address = dws->tx_dma;
dws->tx_sgl.length = dws->len; dws->tx_sgl.length = dws->len;
txdesc = dmaengine_prep_slave_sg(txchan, txdesc = dmaengine_prep_slave_sg(dws->txchan,
&dws->tx_sgl, &dws->tx_sgl,
1, 1,
DMA_MEM_TO_DEV, DMA_MEM_TO_DEV,
@ -166,14 +162,13 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
rxconf.src_addr_width = dws->dma_width; rxconf.src_addr_width = dws->dma_width;
rxconf.device_fc = false; rxconf.device_fc = false;
rxchan->device->device_control(rxchan, DMA_SLAVE_CONFIG, dmaengine_slave_config(dws->rxchan, &rxconf);
(unsigned long) &rxconf);
memset(&dws->rx_sgl, 0, sizeof(dws->rx_sgl)); memset(&dws->rx_sgl, 0, sizeof(dws->rx_sgl));
dws->rx_sgl.dma_address = dws->rx_dma; dws->rx_sgl.dma_address = dws->rx_dma;
dws->rx_sgl.length = dws->len; dws->rx_sgl.length = dws->len;
rxdesc = dmaengine_prep_slave_sg(rxchan, rxdesc = dmaengine_prep_slave_sg(dws->rxchan,
&dws->rx_sgl, &dws->rx_sgl,
1, 1,
DMA_DEV_TO_MEM, DMA_DEV_TO_MEM,
@ -182,8 +177,8 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
rxdesc->callback_param = dws; rxdesc->callback_param = dws;
/* rx must be started before tx due to spi instinct */ /* rx must be started before tx due to spi instinct */
rxdesc->tx_submit(rxdesc); dmaengine_submit(rxdesc);
txdesc->tx_submit(txdesc); dmaengine_submit(txdesc);
return 0; return 0;
} }