diff options
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7740.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7740.c | 30 |
2 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/include/mach/r8a7740.h index f71507b3f917..0f14ce8d9f01 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7740.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7740.h | |||
@@ -591,6 +591,12 @@ enum { | |||
591 | /* DMA slave IDs */ | 591 | /* DMA slave IDs */ |
592 | enum { | 592 | enum { |
593 | SHDMA_SLAVE_INVALID, | 593 | SHDMA_SLAVE_INVALID, |
594 | SHDMA_SLAVE_SDHI0_RX, | ||
595 | SHDMA_SLAVE_SDHI0_TX, | ||
596 | SHDMA_SLAVE_SDHI1_RX, | ||
597 | SHDMA_SLAVE_SDHI1_TX, | ||
598 | SHDMA_SLAVE_SDHI2_RX, | ||
599 | SHDMA_SLAVE_SDHI2_TX, | ||
594 | SHDMA_SLAVE_FSIA_RX, | 600 | SHDMA_SLAVE_FSIA_RX, |
595 | SHDMA_SLAVE_FSIA_TX, | 601 | SHDMA_SLAVE_FSIA_TX, |
596 | SHDMA_SLAVE_FSIB_TX, | 602 | SHDMA_SLAVE_FSIB_TX, |
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 516a7ec55620..320c43af8614 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c | |||
@@ -306,6 +306,36 @@ enum { | |||
306 | 306 | ||
307 | static const struct sh_dmae_slave_config r8a7740_dmae_slaves[] = { | 307 | static const struct sh_dmae_slave_config r8a7740_dmae_slaves[] = { |
308 | { | 308 | { |
309 | .slave_id = SHDMA_SLAVE_SDHI0_TX, | ||
310 | .addr = 0xe6850030, | ||
311 | .chcr = CHCR_TX(XMIT_SZ_16BIT), | ||
312 | .mid_rid = 0xc1, | ||
313 | }, { | ||
314 | .slave_id = SHDMA_SLAVE_SDHI0_RX, | ||
315 | .addr = 0xe6850030, | ||
316 | .chcr = CHCR_RX(XMIT_SZ_16BIT), | ||
317 | .mid_rid = 0xc2, | ||
318 | }, { | ||
319 | .slave_id = SHDMA_SLAVE_SDHI1_TX, | ||
320 | .addr = 0xe6860030, | ||
321 | .chcr = CHCR_TX(XMIT_SZ_16BIT), | ||
322 | .mid_rid = 0xc9, | ||
323 | }, { | ||
324 | .slave_id = SHDMA_SLAVE_SDHI1_RX, | ||
325 | .addr = 0xe6860030, | ||
326 | .chcr = CHCR_RX(XMIT_SZ_16BIT), | ||
327 | .mid_rid = 0xca, | ||
328 | }, { | ||
329 | .slave_id = SHDMA_SLAVE_SDHI2_TX, | ||
330 | .addr = 0xe6870030, | ||
331 | .chcr = CHCR_TX(XMIT_SZ_16BIT), | ||
332 | .mid_rid = 0xcd, | ||
333 | }, { | ||
334 | .slave_id = SHDMA_SLAVE_SDHI2_RX, | ||
335 | .addr = 0xe6870030, | ||
336 | .chcr = CHCR_RX(XMIT_SZ_16BIT), | ||
337 | .mid_rid = 0xce, | ||
338 | }, { | ||
309 | .slave_id = SHDMA_SLAVE_FSIA_TX, | 339 | .slave_id = SHDMA_SLAVE_FSIA_TX, |
310 | .addr = 0xfe1f0024, | 340 | .addr = 0xfe1f0024, |
311 | .chcr = CHCR_TX(XMIT_SZ_32BIT), | 341 | .chcr = CHCR_TX(XMIT_SZ_32BIT), |