From 83f9d2918ef0c8da5e0b07fc83e3da83cf3f7cd8 Mon Sep 17 00:00:00 2001 From: Per Forlin Date: Wed, 26 Oct 2011 11:33:30 +0200 Subject: 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 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35325 Reviewed-by: Stefan NILSSON9 Tested-by: Stefan NILSSON9 Reviewed-by: Ulf HANSSON --- arch/arm/mach-ux500/board-mop500-sdi.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index ee49e5f7f33..20be9e90eff 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -56,7 +56,6 @@ static int mop500_sdi0_ios_handler(struct device *dev, struct mmc_ios *ios) return 0; } -#ifdef MMC_SUSPEND_WORKAROUND #ifdef CONFIG_STE_DMA40 struct stedma40_chan_cfg mop500_sdi0_dma_cfg_rx = { .mode = STEDMA40_MODE_LOGICAL, @@ -80,7 +79,6 @@ static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = { .phy_channel = 0, }; #endif -#endif static struct mmci_platform_data mop500_sdi0_data = { .ios_handler = mop500_sdi0_ios_handler, @@ -94,19 +92,16 @@ static struct mmci_platform_data mop500_sdi0_data = { MCI_ST_CMDDIREN | MCI_ST_DATA0DIREN | MCI_ST_DATA2DIREN, -#ifdef MMC_SUSPEND_WORKAROUND #ifdef CONFIG_STE_DMA40 .dma_filter = stedma40_filter, .dma_rx_param = &mop500_sdi0_dma_cfg_rx, .dma_tx_param = &mop500_sdi0_dma_cfg_tx, #endif -#endif }; /* * SDI1 (SDIO WLAN) */ -#ifdef SDIO_DMA_ON #ifdef CONFIG_STE_DMA40 static struct stedma40_chan_cfg sdi1_dma_cfg_rx = { .mode = STEDMA40_MODE_LOGICAL, @@ -126,7 +121,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, @@ -134,13 +128,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) @@ -182,7 +174,6 @@ void mop500_sdi_tc35892_init(void) /* * SDI 2 (POP eMMC, not on DB8500ed) */ -#ifdef MMC_SUSPEND_WORKAROUND #ifdef CONFIG_STE_DMA40 struct stedma40_chan_cfg mop500_sdi2_dma_cfg_rx = { .mode = STEDMA40_MODE_LOGICAL, @@ -202,7 +193,6 @@ static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = { .dst_info.data_width = STEDMA40_WORD_WIDTH, }; #endif -#endif static struct mmci_platform_data mop500_sdi2_data = { .ocr_mask = MMC_VDD_165_195, @@ -211,20 +201,17 @@ static struct mmci_platform_data mop500_sdi2_data = { MMC_CAP_8_BIT_DATA, .gpio_cd = -1, .gpio_wp = -1, -#ifdef MMC_SUSPEND_WORKAROUND #ifdef CONFIG_STE_DMA40 .dma_filter = stedma40_filter, .dma_rx_param = &mop500_sdi2_dma_cfg_rx, .dma_tx_param = &mop500_sdi2_dma_cfg_tx, #endif -#endif }; /* * SDI 4 (on-board eMMC) */ -#ifdef MMC_SUSPEND_WORKAROUND #ifdef CONFIG_STE_DMA40 struct stedma40_chan_cfg mop500_sdi4_dma_cfg_rx = { .mode = STEDMA40_MODE_LOGICAL, @@ -244,7 +231,6 @@ static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = { .dst_info.data_width = STEDMA40_WORD_WIDTH, }; #endif -#endif static struct mmci_platform_data mop500_sdi4_data = { .ocr_mask = MMC_VDD_29_30, @@ -254,13 +240,11 @@ static struct mmci_platform_data mop500_sdi4_data = { MMC_CAP_MMC_HIGHSPEED, .gpio_cd = -1, .gpio_wp = -1, -#ifdef MMC_SUSPEND_WORKAROUND #ifdef CONFIG_STE_DMA40 .dma_filter = stedma40_filter, .dma_rx_param = &mop500_sdi4_dma_cfg_rx, .dma_tx_param = &mop500_sdi4_dma_cfg_tx, #endif -#endif }; void __init mop500_sdi_init(void) -- cgit v1.2.3