---

yaml --- r: 287224 b: refs/heads/master c: e9c8d7a h: refs/heads/master v: v3
git-mirror · Feb 1, 2012 · 4d5ee3a · 4d5ee3a
1 parent cd6bfbe
commit 4d5ee3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5044cddad2fba36c725a019a6cd0e3f286b13d0
+refs/heads/master: e9c8d7a03e69093e4c33c5056a45c1233a42e8a4
diff --git 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
@@ -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 */