Merge tag 'davinci-for-v4.6/edma' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Feb 2016 21:42:05 +0000 (22:42 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Feb 2016 21:42:05 +0000 (22:42 +0100)
commit8bba98a8c1527f1cc121776cf5fac97ac2d3089c
treecf0755eb8249c0909f79dbe4d26be710153aea8a
parentac838df7f8fc7aaf87f3361b87542dc8aa957f33
parent2137d54d1643c1dcb1ff919f169b4542669a372e
Merge tag 'davinci-for-v4.6/edma' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/soc

Merge "DaVinci EDMA enhancements for v4.6" from Sekhar Nori:

Pass dma_slave_map data to EDMA driver. This will help
migration to new DMA engine API for requesting
slave channels dma_request_chan().

* tag 'davinci-for-v4.6/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: dm646x: Add dma_slave_map to edma
  ARM: davinci: dm644x: Add dma_slave_map to edma
  ARM: davinci: dm365: Add dma_slave_map to edma
  ARM: davinci: dm355: Add dma_slave_map to edma
  ARM: davinci: devices-da8xx: Add dma_slave_map to edma