diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-14 13:58:37 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-14 14:00:10 -0700 |
| commit | 4fd0376356ed2e1f6c2a4e8628782aedf903292e (patch) | |
| tree | 581f8dbb860ca6176c543379bc455bdc4a95c088 /arch/arm/mach-shmobile/board-bockw.c | |
| parent | d174ec22872c35d5ce1d223072bc8bd12ad1fef4 (diff) | |
| parent | 7d4bde88e1135c4a3106b79650d3b85335f35717 (diff) | |
Merge branch 'renesas/boards2' into next/boards
From Simon Horman:
* renesas/boards2: (64 commits)
ARM: shmobile: marzen: enable INTC IRQ
ARM: shmobile: bockw: add SMSC support on reference
ARM: shmobile: Use SMP on Koelsch
ARM: shmobile: Remove KZM9D reference DTS
ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
ARM: shmobile: Remove non-multiplatform KZM9D reference support
ARM: shmobile: Use KZM9D without reference for multiplatform
ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
ARM: shmobile: Use arch timer on Koelsch
ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch
ARM: shmobile: Genmai support
ARM: shmobile: marzen: enable DMA for SDHI0
ARM: shmobile: bockw: enable DMA for SDHI0
ARM: shmobile: ape6evm: add DMA support to MMCIF
ARM: shmobile: r8a7791 SMP support
ARM: shmobile: r8a7779: split r8a7779_init_irq_extpin() for DT
ARM: shmobile: r8a7778: split r8a7778_init_irq_extpin() for DT
ARM: shmobile: r7s72100 SCIF support
ARM: shmobile: Initial r7s72100 SoC support
ARM: shmobile: r8a7791 Arch timer workaround
...
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-shmobile/board-bockw.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-bockw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index 330e84c14f8e..421cf1c229dc 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -196,6 +196,8 @@ static struct rcar_phy_platform_data usb_phy_platform_data __initdata = /* SDHI */ static struct sh_mobile_sdhi_info sdhi0_info __initdata = { + .dma_slave_tx = HPBDMA_SLAVE_SDHI0_TX, + .dma_slave_rx = HPBDMA_SLAVE_SDHI0_RX, .tmio_caps = MMC_CAP_SD_HIGHSPEED, .tmio_ocr_mask = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34, .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT, |