From: Vinod Koul <vinod.koul@intel.com>
To: dan.j.williams@intel.com
Cc: linux-kernel@vger.kernel.org, jaswinder.singh@linaro.org,
21cnbao@gmail.com, rmk@arm.linux.org.uk,
Vinod Koul <vinod.koul@linux.intel.com>,
Ben Dooks <ben-linux@fluff.org>,
Kukjin Kim <kgene.kim@samsung.com>,
Boojin Kim <boojin.kim@samsung.com>
Subject: [PATCH 03/10] plat-samsung: move to dma_transfer_direction
Date: Fri, 14 Oct 2011 11:08:18 +0530 [thread overview]
Message-ID: <1318570705-17595-4-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1318570705-17595-1-git-send-email-vinod.koul@intel.com>
From: Vinod Koul <vinod.koul@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Boojin Kim <boojin.kim@samsung.com>
---
arch/arm/plat-samsung/dma-ops.c | 4 ++--
arch/arm/plat-samsung/include/plat/dma-ops.h | 4 ++--
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 6e3d9ab..a044171 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,
chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch);
- if (info->direction == DMA_FROM_DEVICE) {
+ if (info->direction == DEV_TO_MEM) {
memset(&slave_config, 0, sizeof(struct dma_slave_config));
slave_config.direction = info->direction;
slave_config.src_addr = info->fifo;
slave_config.src_addr_width = info->width;
slave_config.src_maxburst = 1;
dmaengine_slave_config(chan, &slave_config);
- } else if (info->direction == DMA_TO_DEVICE) {
+ } else if (info->direction == MEM_TO_DEV) {
memset(&slave_config, 0, sizeof(struct dma_slave_config));
slave_config.direction = info->direction;
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 4c1a363..1256115 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 @@
struct samsung_dma_prep_info {
enum dma_transaction_type cap;
- enum dma_data_direction direction;
+ enum dma_transfer_direction direction;
dma_addr_t buf;
unsigned long period;
unsigned long len;
@@ -27,7 +27,7 @@ struct samsung_dma_prep_info {
struct samsung_dma_info {
enum dma_transaction_type cap;
- enum dma_data_direction direction;
+ enum dma_transfer_direction direction;
enum dma_slave_buswidth width;
dma_addr_t fifo;
struct s3c2410_dma_client *client;
--
1.7.0.4
next prev parent reply other threads:[~2011-10-14 5:47 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 5:38 [PATCH 00/10] dmaengine: move to enum dma_transfer_direction Vinod Koul
2011-10-14 5:38 ` [PATCH 01/10] dmaengine: add new " Vinod Koul
2011-10-14 6:15 ` Barry Song
2011-10-15 12:46 ` Russell King
2011-10-15 14:22 ` Barry Song
2011-10-15 17:04 ` Vinod Koul
2011-10-14 5:38 ` [PATCH 02/10] dmaengine: move drivers to dma_transfer_direction Vinod Koul
2011-10-15 19:02 ` Mika Westerberg
2011-10-16 11:02 ` Linus Walleij
2011-10-17 5:28 ` Viresh Kumar
2011-10-17 13:15 ` Vinod Koul
2011-10-18 9:06 ` Viresh Kumar
2011-10-17 9:58 ` Nicolas Ferre
2011-10-17 12:52 ` Guennadi Liakhovetski
2011-10-18 2:48 ` Vinod Koul
2011-10-27 16:56 ` Vinod Koul
2011-11-21 12:20 ` Dan Carpenter
2011-11-21 16:03 ` Vinod Koul
2011-10-14 5:38 ` Vinod Koul [this message]
2011-10-14 7:28 ` [PATCH 03/10] plat-samsung: move " Kukjin Kim
2011-10-14 16:14 ` Vinod Koul
2011-10-14 5:38 ` [PATCH 04/10] media-video: " Vinod Koul
2011-10-17 12:52 ` Guennadi Liakhovetski
2011-10-14 5:38 ` [PATCH 05/10] carma: " Vinod Koul
2011-10-14 5:38 ` [PATCH 06/10] mmc-host: " Vinod Koul
2011-10-17 9:56 ` Nicolas Ferre
2011-10-17 12:59 ` Guennadi Liakhovetski
2011-10-14 5:38 ` [PATCH 07/10] spi, serial: " Vinod Koul
2011-10-15 19:00 ` Mika Westerberg
2011-10-16 8:01 ` Vinod Koul
2011-10-16 4:21 ` Grant Likely
2011-10-16 8:03 ` Vinod Koul
2011-10-14 5:38 ` [PATCH 08/10] sound-soc: " Vinod Koul
2011-10-14 9:40 ` Mark Brown
2011-10-14 5:38 ` [PATCH 09/10] USB: " Vinod Koul
2011-10-14 7:20 ` Felipe Balbi
2011-10-14 7:17 ` Vinod Koul
2011-10-14 11:01 ` Jassi Brar
2011-10-14 16:13 ` Vinod Koul
2011-10-14 5:38 ` [PATCH 10/10] net-ks8842: " Vinod Koul
2011-10-14 16:39 ` [PATCH v2 1/2] USB-musb: " Vinod Koul
2011-11-08 14:02 ` Felipe Balbi
2011-11-08 14:07 ` Felipe Balbi
2011-11-08 16:12 ` Vinod Koul
2011-11-09 6:09 ` Felipe Balbi
2011-11-09 8:38 ` Mian Yousaf Kaukab
2011-10-14 16:39 ` [PATCH 2/2] USB-renesas: " Vinod Koul
2011-11-08 14:02 ` Felipe Balbi
2011-11-09 6:10 ` Felipe Balbi
2011-11-10 0:06 ` Kuninori Morimoto
2011-11-10 0:06 ` Kuninori Morimoto
2011-11-17 9:19 ` [PATCH 00/10] dmaengine: move to enum dma_transfer_direction Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318570705-17595-4-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=21cnbao@gmail.com \
--cc=ben-linux@fluff.org \
--cc=boojin.kim@samsung.com \
--cc=dan.j.williams@intel.com \
--cc=jaswinder.singh@linaro.org \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=vinod.koul@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®