Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / arch / arm / mach-s3c64xx / dma.c

diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c
index 5567e03..135db1b 100644 (file)
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@ -212,6 +212,7 @@ static int s3c64xx_dma_start(struct s3c2410_dma_chan *chan)
 
        config = readl(chan->regs + PL080S_CH_CONFIG);
        config |= PL080_CONFIG_ENABLE;
+       config &= ~PL080_CONFIG_HALT;
 
        pr_debug("%s: writing config %08x\n", __func__, config);
        writel(config, chan->regs + PL080S_CH_CONFIG);
@@ -697,7 +698,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
                chptr->number = chno;
                chptr->dmac = dmac;
                chptr->regs = regptr;
-               regptr += PL008_Cx_STRIDE;
+               regptr += PL080_Cx_STRIDE;
        }
 
        /* for the moment, permanently enable the controller */
@@ -740,7 +741,7 @@ static int __init s3c64xx_dma_init(void)
        /* Set all DMA configuration to be DMA, not SDMA */
        writel(0xffffff, S3C_SYSREG(0x110));
 
-       /* Register standard DMA controlers */
+       /* Register standard DMA controllers */
        s3c64xx_dma_init1(0, DMACH_UART0, IRQ_DMA0, 0x75000000);
        s3c64xx_dma_init1(8, DMACH_PCM1_TX, IRQ_DMA1, 0x75100000);