]> git.baikalelectronics.ru Git - kernel.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)
commit7774ec585dbe71b539cbc150dfa04594825da945
tree8fc2fcf30eb1233e85925be17dcd16a71e522f48
parent5348ae6e96781c6210c4968401604c7f5f2ea850
parente579f08066ef636c7e610482a3fc962200a220c4
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