diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 02:45:43 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 02:45:43 -0500 |
commit | 1ad2096c4eba144522d87541c4024b8c84e95051 (patch) | |
tree | a149d469a4da72a7b6e6b777879b740046c4ebc9 /arch/arm/mach-shmobile/board-ap4evb.c | |
parent | c4d73e7d75a54451d6e073c118ba2b8d87bd350d (diff) | |
parent | df73af86b6e737f357aae85e0b5e621516117780 (diff) |
Merge branch 'rmobile/mmcif' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/board-ap4evb.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index d440e5f456ad..5b079529c948 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
@@ -272,6 +272,15 @@ static struct resource sh_mmcif_resources[] = { | |||
272 | }, | 272 | }, |
273 | }; | 273 | }; |
274 | 274 | ||
275 | static struct sh_mmcif_dma sh_mmcif_dma = { | ||
276 | .chan_priv_rx = { | ||
277 | .slave_id = SHDMA_SLAVE_MMCIF_RX, | ||
278 | }, | ||
279 | .chan_priv_tx = { | ||
280 | .slave_id = SHDMA_SLAVE_MMCIF_TX, | ||
281 | }, | ||
282 | }; | ||
283 | |||
275 | static struct sh_mmcif_plat_data sh_mmcif_plat = { | 284 | static struct sh_mmcif_plat_data sh_mmcif_plat = { |
276 | .sup_pclk = 0, | 285 | .sup_pclk = 0, |
277 | .ocr = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34, | 286 | .ocr = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34, |
@@ -279,6 +288,7 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = { | |||
279 | MMC_CAP_8_BIT_DATA | | 288 | MMC_CAP_8_BIT_DATA | |
280 | MMC_CAP_NEEDS_POLL, | 289 | MMC_CAP_NEEDS_POLL, |
281 | .get_cd = slot_cn7_get_cd, | 290 | .get_cd = slot_cn7_get_cd, |
291 | .dma = &sh_mmcif_dma, | ||
282 | }; | 292 | }; |
283 | 293 | ||
284 | static struct platform_device sh_mmcif_device = { | 294 | static struct platform_device sh_mmcif_device = { |