[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <087001cc8a42$ea2ec4f0$be8c4ed0$%kim@samsung.com>
Date: Fri, 14 Oct 2011 16:28:48 +0900
From: Kukjin Kim <kgene.kim@...sung.com>
To: 'Vinod Koul' <vinod.koul@...el.com>, dan.j.williams@...el.com
Cc: linux-kernel@...r.kernel.org, jaswinder.singh@...aro.org,
21cnbao@...il.com, rmk@....linux.org.uk,
'Vinod Koul' <vinod.koul@...ux.intel.com>,
'Ben Dooks' <ben-linux@...ff.org>,
'Boojin Kim' <boojin.kim@...sung.com>
Subject: RE: [PATCH 03/10] plat-samsung: move to dma_transfer_direction
Vinod Koul wrote:
>
> From: Vinod Koul <vinod.koul@...ux.intel.com>
>
> Signed-off-by: Vinod Koul <vinod.koul@...ux.intel.com>
> Cc: Ben Dooks <ben-linux@...ff.org>
> Cc: Kukjin Kim <kgene.kim@...sung.com>
Hi Vinod,
If you want to take this in your tree, you can go ahead with ack from me.
Acked-by: Kukjin Kim <kgene.kim@...sung.com>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@...sung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> Cc: Boojin Kim <boojin.kim@...sung.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists