mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul: "Two minor fixes. First one from Kuninori clarifying dmas bindings and second from Lars for fixing dma descriptor completion in non cyclic case" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: jz4740: Fix non-cyclic descriptor completion dt/bindings: rcar-audmapp: tidyup dmas explanation
This commit is contained in:
commit
1497e84a49
2 changed files with 5 additions and 4 deletions
|
@ -16,9 +16,9 @@ Example:
|
||||||
* DMA client
|
* DMA client
|
||||||
|
|
||||||
Required properties:
|
Required properties:
|
||||||
- dmas: a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
|
- dmas: a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.
|
||||||
where SRS/DRS values are fixed handles, specified in the SoC
|
where SRS/DRS are specified in the SoC manual.
|
||||||
manual as the value that would be written into the PDMACHCR.
|
It will be written into PDMACHCR as high 16-bit parts.
|
||||||
- dma-names: a list of DMA channel names, one per "dmas" entry
|
- dma-names: a list of DMA channel names, one per "dmas" entry
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
|
@ -362,8 +362,9 @@ static void jz4740_dma_chan_irq(struct jz4740_dmaengine_chan *chan)
|
||||||
vchan_cyclic_callback(&chan->desc->vdesc);
|
vchan_cyclic_callback(&chan->desc->vdesc);
|
||||||
} else {
|
} else {
|
||||||
if (chan->next_sg == chan->desc->num_sgs) {
|
if (chan->next_sg == chan->desc->num_sgs) {
|
||||||
chan->desc = NULL;
|
list_del(&chan->desc->vdesc.node);
|
||||||
vchan_cookie_complete(&chan->desc->vdesc);
|
vchan_cookie_complete(&chan->desc->vdesc);
|
||||||
|
chan->desc = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue