From 54c9d0b4a9be315491978973a5080ad00a648d67 Mon Sep 17 00:00:00 2001
From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Wed, 1 Feb 2012 22:31:14 +0530
Subject: [PATCH] --- yaml --- r: 297491 b: refs/heads/master c:
 e7211718b3aa0365a723d9b8192e6f50236a1c67 h: refs/heads/master i:   297489:
 25a477124c23db64b2d850e7a057f935c237b556   297487:
 712946a59929417ad95590d604fa5df21ef2c71d v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-shmobile/setup-sh7372.c | 2 ++
 trunk/drivers/dma/shdma.c                   | 3 ++-
 trunk/include/linux/sh_dma.h                | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 942c7ffd7248..8a003a0c2e26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba7932334fbede4bb6a4ff4e635391ca7833203f
+refs/heads/master: e7211718b3aa0365a723d9b8192e6f50236a1c67
diff --git a/trunk/arch/arm/mach-shmobile/setup-sh7372.c b/trunk/arch/arm/mach-shmobile/setup-sh7372.c
index 6fcf304d3cdf..a83cf51fc099 100644
--- a/trunk/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/trunk/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[] = {
diff --git a/trunk/drivers/dma/shdma.c b/trunk/drivers/dma/shdma.c
index 54043cd831c8..812fd76e9c18 100644
--- a/trunk/drivers/dma/shdma.c
+++ b/trunk/drivers/dma/shdma.c
@@ -1262,7 +1262,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/trunk/include/linux/sh_dma.h b/trunk/include/linux/sh_dma.h
index 8cd7fe59cf1a..425450b980b8 100644
--- a/trunk/include/linux/sh_dma.h
+++ b/trunk/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 */