diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 13:57:38 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 13:57:38 +0400 |
| commit | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (patch) | |
| tree | cbc0254ef952f10e99e384b56ccc7b81389e335e /arch/arm/mach-s3c64xx/dma.c | |
| parent | 7d84b3e93757fe871d57b43c422b81cc8b94057a (diff) | |
| parent | c9312209aa9fdef05b03d63bbead63bb720fd133 (diff) | |
| download | linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.tar.xz | |
Merge branch 'next/topic-dma-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-s3c64xx/dma.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index 0849f2d3b105..17d62f4f8204 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c @@ -147,14 +147,14 @@ static void s3c64xx_dma_fill_lli(struct s3c2410_dma_chan *chan, u32 control0, control1; switch (chan->source) { - case S3C2410_DMASRC_HW: + case DMA_FROM_DEVICE: src = chan->dev_addr; dst = data; control0 = PL080_CONTROL_SRC_AHB2; control0 |= PL080_CONTROL_DST_INCR; break; - case S3C2410_DMASRC_MEM: + case DMA_TO_DEVICE: src = data; dst = chan->dev_addr; control0 = PL080_CONTROL_DST_AHB2; @@ -416,7 +416,7 @@ EXPORT_SYMBOL(s3c2410_dma_enqueue); int s3c2410_dma_devconfig(enum dma_ch channel, - enum s3c2410_dmasrc source, + enum dma_data_direction source, unsigned long devaddr) { struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel); @@ -437,11 +437,11 @@ int s3c2410_dma_devconfig(enum dma_ch channel, pr_debug("%s: peripheral %d\n", __func__, peripheral); switch (source) { - case S3C2410_DMASRC_HW: + case DMA_FROM_DEVICE: config = 2 << PL080_CONFIG_FLOW_CONTROL_SHIFT; config |= peripheral << PL080_CONFIG_SRC_SEL_SHIFT; break; - case S3C2410_DMASRC_MEM: + case DMA_TO_DEVICE: config = 1 << PL080_CONFIG_FLOW_CONTROL_SHIFT; config |= peripheral << PL080_CONFIG_DST_SEL_SHIFT; break; |