diff options
| author | Per Forlin <per.forlin@stericsson.com> | 2011-10-26 11:33:30 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-06 17:30:02 +0100 |
| commit | f465215bf31f0e6f383d51857b42661df43e8f1c (patch) | |
| tree | bd0b237c31c196f93fab24f9cd72e608969b4d37 | |
| parent | e115cdede33efea7f7ad562350c20588e7aad691 (diff) | |
ARM: ux500: SDI: enable DMA on all SDI devices
Enable DMA again now when power save for MMC and DMA is in place.
Patch is tested:
* suspend and resume successfully in Android.
* suspend video playback from sd-card and resume it
successfully in Android.
ST-Ericsson ID: 370129
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I4eb9367c3feeb8661e33035d4d3022205b9e924b
Signed-off-by: Per Forlin <per.forlin@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35325
Reviewed-by: Stefan NILSSON9 <stefan.xk.nilsson@stericsson.com>
Tested-by: Stefan NILSSON9 <stefan.xk.nilsson@stericsson.com>
Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-sdi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 1ed9669b1a1..59ac76f980b 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -108,7 +108,6 @@ static struct mmci_platform_data mop500_sdi0_data = { /* * SDI1 (SDIO WLAN) */ -#ifdef SDIO_DMA_ON #ifdef CONFIG_STE_DMA40 static struct stedma40_chan_cfg sdi1_dma_cfg_rx = { .mode = STEDMA40_MODE_LOGICAL, @@ -128,7 +127,6 @@ static struct stedma40_chan_cfg sdi1_dma_cfg_tx = { .dst_info.data_width = STEDMA40_WORD_WIDTH, }; #endif -#endif static struct mmci_platform_data mop500_sdi1_data = { .ocr_mask = MMC_VDD_29_30, @@ -136,13 +134,11 @@ static struct mmci_platform_data mop500_sdi1_data = { .capabilities = MMC_CAP_4_BIT_DATA, .gpio_cd = -1, .gpio_wp = -1, -#ifdef SDIO_DMA_ON #ifdef CONFIG_STE_DMA40 .dma_filter = stedma40_filter, .dma_rx_param = &sdi1_dma_cfg_rx, .dma_tx_param = &sdi1_dma_cfg_tx, #endif -#endif }; static void sdi0_sdi1_configure(void) |