]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge tag 'davinci-for-v3.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 24 Jun 2013 14:46:23 +0000 (16:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 24 Jun 2013 14:46:23 +0000 (16:46 +0200)
commit8ecb6ca61ac673f3712f82259de5b0a25d21d532
tree8fc2fcf30eb1233e85925be17dcd16a71e522f48
parent3aae7ab0f15d69166789cf84aea39e6b438c4c26
parente65abbbc5279319ab679298f8740ddf53e022a5e
Merge tag 'davinci-for-v3.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

From Sekhar Nori:

DaVinci SoC updates for v3.11 - part 2

This pull request adds DT and runtime PM to
EDMA ARM private API so it can be used on
DT enabled DaVinci and OMAP platforms.

Also adds DMA channel crossbar mapping
support to be used by DT-enabled platforms
which use it.

* tag 'davinci-for-v3.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  dmaengine: edma: enable build for AM33XX
  ARM: edma: Add EDMA crossbar event mux support
  ARM: edma: Add DT and runtime PM support to the private EDMA API
  dmaengine: edma: Add TI EDMA device tree binding
  ARM: edma: Convert to devm_* api

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-omap2/Kconfig