summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-04 10:54:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-04 10:54:26 -0800
commit4554c135a0a017f4cd96f7c0612cb7ca78c68d08 (patch)
tree7233d0c493223fb3769c4dd0668bd8da4fd02241 /arch
parent82bdc843c2be0ce199e8e247dfb2a17248cbd6c4 (diff)
parent94ac27a54be6a14948f0a9b3f542b4ff1faac232 (diff)
downloadlinux-4554c135a0a017f4cd96f7c0612cb7ca78c68d08.tar.bz2
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: i.MX SDMA: Fix burstsize settings ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only dma: sh_dma: not all SH DMAC implementations support MEMCPY at_hdmac: bugfix for enabling channel irq dmaengine: fix missing 'cnt' in ?: in dmatest
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/setup-sh7372.c2
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 6fcf304d3cdf..a83cf51fc099 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[] = {