Skip to contentSkip to conversation

slave-dmaengine updates 2

GIT PULL Vinod Koul 1 participant 1 message Mar 1, 2013

lore
Share & tools
lore

Vinod Koul

author
#0 lore raw

Hi Linus,

Here is my second pull request for this merge window.

The Arnd's patch moves the dw_dmac to use generic DMA binding. I agreed to merge this late as it will avoid the conflicts between tree's.

The second patch from Matt adding a dma_request_slave_channel_compat API was supposed to be picked up, but somehow never got picked up. Some patches dependent on this are already in -next :(

Thanks
~Vinod

The following changes since commit 17166a3b6e88b93189e6be5f7e1335a3cc4fa965:
are available in the git repository at:

git://git.infradead.org/users/vkoul/slave-dma.git next

Arnd Bergmann (1):
dmaengine: dw_dmac: move to generic DMA binding

Matt Porter (1):
dmaengine: add dma_request_slave_channel_compat()

 Documentation/devicetree/bindings/dma/snps-dma.txt |   70 +++++-----
 drivers/dma/dw_dmac.c                              |  145 ++++++++++----------
 drivers/dma/dw_dmac_regs.h                         |    7 +-
 include/linux/dmaengine.h                          |   16 ++
 include/linux/dw_dmac.h                            |    5 -
 5 files changed, 127 insertions(+), 116 deletions(-)