Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / dma.c

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index dcbba07cf98aad648367b62b5d47bc2ba51b52e2..bdb2cfc86728d969ac2c8291228bfac554172dcd 100644 (file)
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -628,7 +628,7 @@ void omap_clear_dma(int lch)
 
        if (cpu_is_omap24xx()) {
                int i;
-               u32 lch_base = OMAP24XX_DMA_BASE + lch * 0x60 + 0x80;
+               u32 lch_base = OMAP_DMA4_BASE + lch * 0x60 + 0x80;
                for (i = 0; i < 0x44; i += 4)
                        omap_writel(0, lch_base + i);
        }
@@ -776,7 +776,7 @@ dma_addr_t omap_get_dma_dst_pos(int lch)
                                       (OMAP1_DMA_CDSA_U_REG(lch) << 16));
 
        if (cpu_is_omap24xx())
-               offset = OMAP2_DMA_CDSA_REG(lch);
+               offset = OMAP_DMA_CDAC_REG(lch);
 
        return offset;
 }