aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@linux.intel.com>2011-10-14 01:05:16 -0400
committerVinod Koul <vinod.koul@linux.intel.com>2011-10-31 00:05:50 -0400
commit20dd5a356efcb5bf574baa9adccc775158f13ae1 (patch)
tree58126f0f768c2186a18c52a8d89493072874c813
parentdb8196df4bb6f117caa163aa73b0f16fd62290bd (diff)
plat-samsung: move to dma_transfer_direction
fixup usage of dma direction by introducing dma_transfer_direction, this patch moves samsung drivers to use new enum Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Boojin Kim <boojin.kim@samsung.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
-rw-r--r--arch/arm/plat-samsung/dma-ops.c4
-rw-r--r--arch/arm/plat-samsung/include/plat/dma-ops.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c
index 6e3d9abc9e2..3df0bad036c 100644
--- a/arch/arm/plat-samsung/dma-ops.c
+++ b/arch/arm/plat-samsung/dma-ops.c
@@ -35,14 +35,14 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch,
35 35
36 chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch); 36 chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch);
37 37
38 if (info->direction == DMA_FROM_DEVICE) { 38 if (info->direction == DMA_DEV_TO_MEM) {
39 memset(&slave_config, 0, sizeof(struct dma_slave_config)); 39 memset(&slave_config, 0, sizeof(struct dma_slave_config));
40 slave_config.direction = info->direction; 40 slave_config.direction = info->direction;
41 slave_config.src_addr = info->fifo; 41 slave_config.src_addr = info->fifo;
42 slave_config.src_addr_width = info->width; 42 slave_config.src_addr_width = info->width;
43 slave_config.src_maxburst = 1; 43 slave_config.src_maxburst = 1;
44 dmaengine_slave_config(chan, &slave_config); 44 dmaengine_slave_config(chan, &slave_config);
45 } else if (info->direction == DMA_TO_DEVICE) { 45 } else if (info->direction == DMA_MEM_TO_DEV) {
46 memset(&slave_config, 0, sizeof(struct dma_slave_config)); 46 memset(&slave_config, 0, sizeof(struct dma_slave_config));
47 slave_config.direction = info->direction; 47 slave_config.direction = info->direction;
48 slave_config.dst_addr = info->fifo; 48 slave_config.dst_addr = info->fifo;
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
index 4c1a363526c..12561152fb9 100644
--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
@@ -17,7 +17,7 @@
17 17
18struct samsung_dma_prep_info { 18struct samsung_dma_prep_info {
19 enum dma_transaction_type cap; 19 enum dma_transaction_type cap;
20 enum dma_data_direction direction; 20 enum dma_transfer_direction direction;
21 dma_addr_t buf; 21 dma_addr_t buf;
22 unsigned long period; 22 unsigned long period;
23 unsigned long len; 23 unsigned long len;
@@ -27,7 +27,7 @@ struct samsung_dma_prep_info {
27 27
28struct samsung_dma_info { 28struct samsung_dma_info {
29 enum dma_transaction_type cap; 29 enum dma_transaction_type cap;
30 enum dma_data_direction direction; 30 enum dma_transfer_direction direction;
31 enum dma_slave_buswidth width; 31 enum dma_slave_buswidth width;
32 dma_addr_t fifo; 32 dma_addr_t fifo;
33 struct s3c2410_dma_client *client; 33 struct s3c2410_dma_client *client;