Javier Martin 660cd0dd94 dmaengine: i.MX: Fix merge of cookie branch. ...

When merging DMA cookie changes a small chunk
of code was dropped. This broke imx-dma driver.

This patch adds this chunk again and fixes the problem.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

2012-03-26 11:31:32 +05:30

..

ioat

dmaengine: fix for cookie changes and merge

2012-03-13 11:58:12 +05:30

ipu

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

ppc4xx

dmaengine: ensure all DMA engine drivers initialize their cookies

2012-03-13 11:37:42 +05:30

amba-pl08x.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

at_hdmac_regs.h

dmaengine: at_hdmac: add slave config operation

2012-03-21 21:12:29 +05:30

at_hdmac.c

dmaengine: at_hdmac: add slave config operation

2012-03-21 21:12:29 +05:30

coh901318_lli.c

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

coh901318_lli.h

dmaengine: move drivers to dma_transfer_direction

2011-10-27 20:53:43 +05:30

coh901318.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

dmaengine.c

dma: dmaengine: Distinguish between 'dmaengine: failed to get' messages

2012-03-06 17:01:07 +05:30

dmaengine.h

dmaengine: consolidate initialization of cookies

2012-03-13 11:37:22 +05:30

dmatest.c

dmaengine: fix missing 'cnt' in ?: in dmatest

2012-01-23 11:43:18 -08:00

dw_dmac_regs.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

dw_dmac.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

ep93xx_dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

fsldma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

fsldma.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

imx-dma.c

dmaengine: i.MX: Fix merge of cookie branch.

2012-03-26 11:31:32 +05:30

imx-sdma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

intel_mid_dma_regs.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

intel_mid_dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

iop-adma.c

dmaengine: fix for cookie changes and merge

2012-03-13 11:58:12 +05:30

iovlock.c

…

Kconfig

dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c

2012-03-26 11:31:29 +05:30

Makefile

dmaengine: add CSR SiRFprimaII DMAC driver

2011-11-18 12:25:22 +05:30

mpc512x_dma.c

dmaengine: consolidate initialization of cookies

2012-03-13 11:37:22 +05:30

mv_xor.c

dmaengine: ensure all DMA engine drivers initialize their cookies

2012-03-13 11:37:42 +05:30

mv_xor.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

mxs-dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

pch_dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

pl330.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

shdma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

shdma.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30

sirf-dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

ste_dma40_ll.c

…

ste_dma40_ll.h

dmaengine/ste_dma40: support pm in dma40

2011-11-22 09:46:06 +05:30

ste_dma40.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

timb_dma.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

TODO

dmaengine: remove ste_dma40 from issue_pending TODO

2011-07-14 04:02:08 +05:30

txx9dmac.c

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic

2012-03-21 19:20:23 +05:30

txx9dmac.h

dmaengine: move last completed cookie into generic dma_chan structure

2012-03-13 11:36:06 +05:30