diff options
author | Boojin Kim <boojin.kim@samsung.com> | 2011-09-01 20:44:44 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2011-09-14 01:40:04 -0400 |
commit | 51ddf31da16b1ab9da861eafedad6d263faf4388 (patch) | |
tree | 24d7106ef61ba97e96654c4904cff2167332d1ac /arch/arm/mach-s3c64xx | |
parent | 344b4c48887a443f7478fc7047d1397b20821ed3 (diff) |
ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
This patch removes the samsung specific enum type 's3c2410_dmasrc'
and uses 'dma_data_direction' instead.
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/dma.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index 204bfafe4bfc..67c97fab62fd 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, | |||
147 | u32 control0, control1; | 147 | u32 control0, control1; |
148 | 148 | ||
149 | switch (chan->source) { | 149 | switch (chan->source) { |
150 | case S3C2410_DMASRC_HW: | 150 | case DMA_FROM_DEVICE: |
151 | src = chan->dev_addr; | 151 | src = chan->dev_addr; |
152 | dst = data; | 152 | dst = data; |
153 | control0 = PL080_CONTROL_SRC_AHB2; | 153 | control0 = PL080_CONTROL_SRC_AHB2; |
154 | control0 |= PL080_CONTROL_DST_INCR; | 154 | control0 |= PL080_CONTROL_DST_INCR; |
155 | break; | 155 | break; |
156 | 156 | ||
157 | case S3C2410_DMASRC_MEM: | 157 | case DMA_TO_DEVICE: |
158 | src = data; | 158 | src = data; |
159 | dst = chan->dev_addr; | 159 | dst = chan->dev_addr; |
160 | control0 = PL080_CONTROL_DST_AHB2; | 160 | control0 = PL080_CONTROL_DST_AHB2; |
@@ -416,7 +416,7 @@ EXPORT_SYMBOL(s3c2410_dma_enqueue); | |||
416 | 416 | ||
417 | 417 | ||
418 | int s3c2410_dma_devconfig(enum dma_ch channel, | 418 | int s3c2410_dma_devconfig(enum dma_ch channel, |
419 | enum s3c2410_dmasrc source, | 419 | enum dma_data_direction source, |
420 | unsigned long devaddr) | 420 | unsigned long devaddr) |
421 | { | 421 | { |
422 | struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel); | 422 | struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel); |
@@ -437,11 +437,11 @@ int s3c2410_dma_devconfig(enum dma_ch channel, | |||
437 | pr_debug("%s: peripheral %d\n", __func__, peripheral); | 437 | pr_debug("%s: peripheral %d\n", __func__, peripheral); |
438 | 438 | ||
439 | switch (source) { | 439 | switch (source) { |
440 | case S3C2410_DMASRC_HW: | 440 | case DMA_FROM_DEVICE: |
441 | config = 2 << PL080_CONFIG_FLOW_CONTROL_SHIFT; | 441 | config = 2 << PL080_CONFIG_FLOW_CONTROL_SHIFT; |
442 | config |= peripheral << PL080_CONFIG_SRC_SEL_SHIFT; | 442 | config |= peripheral << PL080_CONFIG_SRC_SEL_SHIFT; |
443 | break; | 443 | break; |
444 | case S3C2410_DMASRC_MEM: | 444 | case DMA_TO_DEVICE: |
445 | config = 1 << PL080_CONFIG_FLOW_CONTROL_SHIFT; | 445 | config = 1 << PL080_CONFIG_FLOW_CONTROL_SHIFT; |
446 | config |= peripheral << PL080_CONFIG_DST_SEL_SHIFT; | 446 | config |= peripheral << PL080_CONFIG_DST_SEL_SHIFT; |
447 | break; | 447 | break; |
diff --git a/arch/arm/mach-s3c64xx/include/mach/dma.h b/arch/arm/mach-s3c64xx/include/mach/dma.h index 74fdf25c9042..fe1a98cf0e4c 100644 --- a/arch/arm/mach-s3c64xx/include/mach/dma.h +++ b/arch/arm/mach-s3c64xx/include/mach/dma.h | |||
@@ -99,7 +99,7 @@ struct s3c2410_dma_chan { | |||
99 | unsigned char peripheral; | 99 | unsigned char peripheral; |
100 | 100 | ||
101 | unsigned int flags; | 101 | unsigned int flags; |
102 | enum s3c2410_dmasrc source; | 102 | enum dma_data_direction source; |
103 | 103 | ||
104 | 104 | ||
105 | dma_addr_t dev_addr; | 105 | dma_addr_t dev_addr; |