diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2013-06-24 16:46:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-24 16:46:23 +0200 |
| commit | 8ecb6ca61ac673f3712f82259de5b0a25d21d532 (patch) | |
| tree | 8fc2fcf30eb1233e85925be17dcd16a71e522f48 /drivers | |
| parent | ARM: keystone: Move CPU bringup code to dedicated asm file (diff) | |
| parent | dmaengine: edma: enable build for AM33XX (diff) | |
| download | linux-dev-8ecb6ca61ac673f3712f82259de5b0a25d21d532.tar.xz linux-dev-8ecb6ca61ac673f3712f82259de5b0a25d21d532.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index e9924898043a..3215a3cb3de8 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -213,7 +213,7 @@ config SIRF_DMA config TI_EDMA tristate "TI EDMA support" - depends on ARCH_DAVINCI + depends on ARCH_DAVINCI || ARCH_OMAP select DMA_ENGINE select DMA_VIRTUAL_CHANNELS default n |