diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-27 00:42:05 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-27 00:42:05 +0300 |
| commit | 8bba98a8c1527f1cc121776cf5fac97ac2d3089c (patch) | |
| tree | cf0755eb8249c0909f79dbe4d26be710153aea8a /arch/arm/mach-alpine | |
| parent | ac838df7f8fc7aaf87f3361b87542dc8aa957f33 (diff) | |
| parent | 2137d54d1643c1dcb1ff919f169b4542669a372e (diff) | |
| download | linux-8bba98a8c1527f1cc121776cf5fac97ac2d3089c.tar.xz | |
Merge tag 'davinci-for-v4.6/edma' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/mach-alpine')
0 files changed, 0 insertions, 0 deletions