Merge tag 'davinci-for-v3.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel...

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>

diff --combined arch/arm/mach-omap2/Kconfig
index 1bfe9ee,f91b07f..a5679a6
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -17,6 -17,7 +17,7 @@@ config ARCH_OMAP2PLU
        select PROC_DEVICETREE if PROC_FS
        select SOC_BUS
        select SPARSE_IRQ
+       select TI_PRIV_EDMA
        select USE_OF
        help
          Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
@@@ -149,14 -150,6 +150,14 @@@ config SOC_AM33X
        select MULTI_IRQ_HANDLER
        select COMMON_CLK
  
 +config SOC_AM43XX
 +      bool "TI AM43x"
 +      select CPU_V7
 +      select MULTI_IRQ_HANDLER
 +      select ARM_GIC
 +      select COMMON_CLK
 +      select MACH_OMAP_GENERIC
 +
  config OMAP_PACKAGE_ZAF
         bool