aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-04-01 21:40:01 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-05-12 16:22:32 -0400
commit880452b616136c94c521c03adea07fd5ebe3ed24 (patch)
treea7ec1b25556492a6f3fa9fc6b5dacc89d5777338
parent173bf69a7af142e0325fa514954f6eeb2d20cc1d (diff)
ARM: mach-shmobile: sh7372: Add FSI DMAEngine support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Tested-by: Simon Horman <horms@verge.net.au> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--arch/arm/mach-shmobile/include/mach/sh7372.h2
-rw-r--r--arch/arm/mach-shmobile/setup-sh7372.c10
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index 8254ab86f6cd..915d0093da08 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -457,6 +457,8 @@ enum {
457 SHDMA_SLAVE_SDHI1_TX, 457 SHDMA_SLAVE_SDHI1_TX,
458 SHDMA_SLAVE_SDHI2_RX, 458 SHDMA_SLAVE_SDHI2_RX,
459 SHDMA_SLAVE_SDHI2_TX, 459 SHDMA_SLAVE_SDHI2_TX,
460 SHDMA_SLAVE_FSIA_RX,
461 SHDMA_SLAVE_FSIA_TX,
460 SHDMA_SLAVE_MMCIF_RX, 462 SHDMA_SLAVE_MMCIF_RX,
461 SHDMA_SLAVE_MMCIF_TX, 463 SHDMA_SLAVE_MMCIF_TX,
462 SHDMA_SLAVE_USB0_TX, 464 SHDMA_SLAVE_USB0_TX,
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 4c7fece5ef92..6a4bd582c028 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -462,6 +462,16 @@ static const struct sh_dmae_slave_config sh7372_dmae_slaves[] = {
462 .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT), 462 .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
463 .mid_rid = 0xce, 463 .mid_rid = 0xce,
464 }, { 464 }, {
465 .slave_id = SHDMA_SLAVE_FSIA_TX,
466 .addr = 0xfe1f0024,
467 .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
468 .mid_rid = 0xb1,
469 }, {
470 .slave_id = SHDMA_SLAVE_FSIA_RX,
471 .addr = 0xfe1f0020,
472 .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
473 .mid_rid = 0xb2,
474 }, {
465 .slave_id = SHDMA_SLAVE_MMCIF_TX, 475 .slave_id = SHDMA_SLAVE_MMCIF_TX,
466 .addr = 0xe6bd0034, 476 .addr = 0xe6bd0034,
467 .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT), 477 .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),