diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 16:43:11 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 16:43:11 +0200 |
commit | 3c373f9983f5531c10c29ae1e3136371c8949140 (patch) | |
tree | 56649c7c898b89afe2e2dc3bfd5336231d3e2da6 /arch/arm/mach-omap1/devices.c | |
parent | 0a15e0b5b9342fd7fb3f40b24872c174b0e402ea (diff) | |
parent | e2081f96ba1be3aa22a44daec82af9b226a6d7d6 (diff) | |
download | op-kernel-dev-3c373f9983f5531c10c29ae1e3136371c8949140.zip op-kernel-dev-3c373f9983f5531c10c29ae1e3136371c8949140.tar.gz |
Merge tag 'omap-for-v3.11/dma-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
Non-critical omap DMA fixes and removal of unused legacy code.
* tag 'omap-for-v3.11/dma-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP1: Remove dma.h
ARM: OMAP1: Remove legacy irda.h and irda setup from board files
ARM: OMAP1: Remove duplicated DMA channel definitions
ARM: OMAP1: Remove McBSP DMA channel definitions
ARM: OMAP2+: Remove dma.h
ARM: OMAP2+: hwmod: Remove remaining DMA channel definitions
ARM: OMAP2+: Remove duplicated DMA channel definitions
ARM: OMAP2+: Remove AES crypto device DMA channel definitions
ARM: OMAP: dma: Remove the erroneous freeing of platform data
ARM: OMAP: dma: Fix the dma_chan_link_map init order
ARM: OMAP: dma: Remove the wrong dev_id check
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
-rw-r--r-- | arch/arm/mach-omap1/devices.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 0af635205..325e603 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -30,7 +30,6 @@ #include "common.h" #include "clock.h" -#include "dma.h" #include "mmc.h" #include "sram.h" @@ -223,16 +222,16 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, case 0: base = OMAP1_MMC1_BASE; irq = INT_MMC; - rx_req = OMAP_DMA_MMC_RX; - tx_req = OMAP_DMA_MMC_TX; + rx_req = 22; + tx_req = 21; break; case 1: if (!cpu_is_omap16xx()) return; base = OMAP1_MMC2_BASE; irq = INT_1610_MMC2; - rx_req = OMAP_DMA_MMC2_RX; - tx_req = OMAP_DMA_MMC2_TX; + rx_req = 55; + tx_req = 54; break; default: continue; |