linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY
@ 2012-01-18  9:14 Guennadi Liakhovetski
  2012-01-18  9:14 ` [PATCH 2/2] ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only Guennadi Liakhovetski
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Guennadi Liakhovetski @ 2012-01-18  9:14 UTC (permalink / raw)
  To: linux-kernel; +Cc: Vinod Koul, linux-sh

Add a flag to allow platforms to specify, whether a DMAC instance supports
the MEMCPY operation. To avoid regressions, preserve the current default.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
 drivers/dma/shdma.c    |    3 ++-
 include/linux/sh_dma.h |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index cabcfe8..e4ed4da 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -1267,7 +1267,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
 
 	INIT_LIST_HEAD(&shdev->common.channels);
 
-	dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
+	if (!pdata->slave_only)
+		dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
 	if (pdata->slave && pdata->slave_num)
 		dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);
 
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index e11e171..db637b9 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -70,6 +70,7 @@ struct sh_dmae_pdata {
 	unsigned int needs_tend_set:1;
 	unsigned int no_dmars:1;
 	unsigned int chclr_present:1;
+	unsigned int slave_only:1;
 };
 
 /* DMA register */
-- 
1.7.2.5


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
  2012-01-18  9:14 [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY Guennadi Liakhovetski
@ 2012-01-18  9:14 ` Guennadi Liakhovetski
  2012-01-18 12:40 ` [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY Paul Mundt
  2012-02-01 17:02 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Guennadi Liakhovetski @ 2012-01-18  9:14 UTC (permalink / raw)
  To: linux-kernel; +Cc: Vinod Koul, linux-sh

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
 arch/arm/mach-shmobile/setup-sh7372.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 45a3418..9aa22395 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -662,6 +662,7 @@ static struct sh_dmae_pdata usb_dma0_platform_data = {
 	.dmaor_is_32bit	= 1,
 	.needs_tend_set	= 1,
 	.no_dmars	= 1,
+	.slave_only	= 1,
 };
 
 static struct resource sh7372_usb_dmae0_resources[] = {
@@ -723,6 +724,7 @@ static struct sh_dmae_pdata usb_dma1_platform_data = {
 	.dmaor_is_32bit	= 1,
 	.needs_tend_set	= 1,
 	.no_dmars	= 1,
+	.slave_only	= 1,
 };
 
 static struct resource sh7372_usb_dmae1_resources[] = {
-- 
1.7.2.5


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY
  2012-01-18  9:14 [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY Guennadi Liakhovetski
  2012-01-18  9:14 ` [PATCH 2/2] ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only Guennadi Liakhovetski
@ 2012-01-18 12:40 ` Paul Mundt
  2012-02-01 17:02 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Paul Mundt @ 2012-01-18 12:40 UTC (permalink / raw)
  To: Guennadi Liakhovetski; +Cc: linux-kernel, Vinod Koul, linux-sh

On Wed, Jan 18, 2012 at 10:14:25AM +0100, Guennadi Liakhovetski wrote:
> Add a flag to allow platforms to specify, whether a DMAC instance supports
> the MEMCPY operation. To avoid regressions, preserve the current default.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

This series looks fine to me.

Acked-by: Paul Mundt <lethal@linux-sh.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY
  2012-01-18  9:14 [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY Guennadi Liakhovetski
  2012-01-18  9:14 ` [PATCH 2/2] ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only Guennadi Liakhovetski
  2012-01-18 12:40 ` [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY Paul Mundt
@ 2012-02-01 17:02 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2012-02-01 17:02 UTC (permalink / raw)
  To: Guennadi Liakhovetski; +Cc: linux-kernel, linux-sh

On Wed, 2012-01-18 at 10:14 +0100, Guennadi Liakhovetski wrote:
> Add a flag to allow platforms to specify, whether a DMAC instance supports
> the MEMCPY operation. To avoid regressions, preserve the current default.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Applied both, Thanks
> ---
>  drivers/dma/shdma.c    |    3 ++-
>  include/linux/sh_dma.h |    1 +
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
> index cabcfe8..e4ed4da 100644
> --- a/drivers/dma/shdma.c
> +++ b/drivers/dma/shdma.c
> @@ -1267,7 +1267,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
>  
>  	INIT_LIST_HEAD(&shdev->common.channels);
>  
> -	dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
> +	if (!pdata->slave_only)
> +		dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
>  	if (pdata->slave && pdata->slave_num)
>  		dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);
>  
> diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
> index e11e171..db637b9 100644
> --- a/include/linux/sh_dma.h
> +++ b/include/linux/sh_dma.h
> @@ -70,6 +70,7 @@ struct sh_dmae_pdata {
>  	unsigned int needs_tend_set:1;
>  	unsigned int no_dmars:1;
>  	unsigned int chclr_present:1;
> +	unsigned int slave_only:1;
>  };
>  
>  /* DMA register */


-- 
~Vinod


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-02-01 17:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-18  9:14 [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY Guennadi Liakhovetski
2012-01-18  9:14 ` [PATCH 2/2] ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only Guennadi Liakhovetski
2012-01-18 12:40 ` [PATCH 1/2] dma: sh_dma: not all SH DMAC implementations support MEMCPY Paul Mundt
2012-02-01 17:02 ` Vinod Koul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).