Commit 1497e84a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8b02c5ef f498e064

Documentation/devicetree/bindings/dma/rcar-audmapp.txt

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ Example: 
* DMA client



Required properties:

- dmas:		a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,

		where SRS/DRS values are fixed handles, specified in the SoC

		manual as the value that would be written into the PDMACHCR.

- dmas:		a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.

		where SRS/DRS are specified in the SoC manual.

		It will be written into PDMACHCR as high 16-bit parts.

- dma-names:	a list of DMA channel names, one per "dmas" entry



Example:

drivers/dma/dma-jz4740.c

+2 −1
Original line number Diff line number Diff line
@@ -362,8 +362,9 @@ static void jz4740_dma_chan_irq(struct jz4740_dmaengine_chan *chan) 
			vchan_cyclic_callback(&chan->desc->vdesc);

		} else {

			if (chan->next_sg == chan->desc->num_sgs) {

				chan->desc = NULL;

				list_del(&chan->desc->vdesc.node);

				vchan_cookie_complete(&chan->desc->vdesc);

				chan->desc = NULL;

			}

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE