linux-toradex.git/drivers/dma/imx-sdma.c, branch v3.0.74

Merge branch 'imx' into dmaengine-fixes

2011-02-14T10:40:46+00:00

Merge branch 'dmaengine-shawn' into dmaengine

2011-01-31T11:42:51+00:00

dmaengine: imx-sdma: fix up param for the last BD in sdma_prep_slave_sg()

2011-01-31T11:42:23+00:00

As per the reference manual, bit "L" should be set while bit "C"
should be cleared for the last buffer descriptor in the non-cyclic
chain, so that sdma can stop trying to find the next BD and end
the transfer.

In case of sdma_prep_slave_sg(), BD_LAST needs to be set and BD_CONT
be cleared for the last BD.

Signed-off-by: Shawn Guo 
Signed-off-by: Sascha Hauer

dmaengine: imx-sdma: correct sdmac->status in sdma_handle_channel_loop()

2011-01-31T11:42:12+00:00

sdma_handle_channel_loop() is the handler of cyclic tx.  One period
success does not really mean the success of the tx.  Instead of
DMA_SUCCESS, DMA_IN_PROGRESS should be the one to tell.

Signed-off-by: Shawn Guo 
Signed-off-by: Sascha Hauer

dmaengine: imx-sdma: return sdmac->status in sdma_tx_status()

2011-01-31T11:41:59+00:00

The sdmac->status was designed to reflect the status of the tx,
so simply return it in sdma_tx_status().  Then dma client can call
dma_async_is_tx_complete() to know the status of the tx.

Signed-off-by: Shawn Guo 
Signed-off-by: Sascha Hauer

dmaengine: imx-sdma: set sdmac->status to DMA_ERROR in err_out of sdma_prep_slave_sg()

2011-01-31T11:41:50+00:00

sdma_prep_dma_cyclic() sets sdmac->status to DMA_ERROR in err_out,
and sdma_prep_slave_sg() needs to do the same.  Otherwise,
sdmac->status stays at DMA_IN_PROGRESS, which will make the function
return immediately next time it gets called.

Signed-off-by: Shawn Guo 
Signed-off-by: Sascha Hauer

dmaengine: imx-sdma: remove IMX_DMA_SG_LOOP handling in sdma_prep_slave_sg()

2011-01-31T11:41:43+00:00

This is a leftover from the time that the driver did not have
sdma_prep_dma_cyclic callback and implemented sound dma as a looped
sg chain.  And it can be removed now.

Signed-off-by: Shawn Guo 
Signed-off-by: Sascha Hauer

dmaengine i.MX SDMA: reserve channel 0 by not registering it

2011-01-31T11:34:31+00:00

We need channel 0 of the sdma engine for internal purposes. We
accomplished this by calling dma_request_channel() in the probe
function. This does not work when multiple dma engines are
present which is the case when IPU support for i.MX31/35 is
compiled in. So instead of registering channel 0 and reserving
it afterwards simply do not register it in the first place.
With this the dmaengine channel counting does not match sdma
channel counting anymore, so we have to use sdma channel counting
in the driver.

Signed-off-by: Sascha Hauer

dmaengine i.MX SDMA: initialize dma capabilities outside channel loop

2011-01-31T11:34:24+00:00

The capabilities are device specific fields, not channel specific fields.

Signed-off-by: Sascha Hauer

dmaengine i.MX SDMA: do not initialize chan_id field

2011-01-31T11:33:18+00:00

This is bogus as the dmaengine core will overwrite this field.

Signed-off-by: Sascha Hauer