summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-05-06 08:44:02 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:02 +0200
commite2320801f5403dc0de516d71fb1ec66d7bc1fdcf (patch)
treeac4aed365d0914e4197052774145be0244184f4c
parent433bcafc021b0f2cc89238a0b40a16f3449a17ee (diff)
mach-ux500: Enable DMA for sdi1
ST-Ericsson ID: 329007 Change-Id: I608e1acad5f6fbb46f6d1ef6bede8e58bd57c362 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19462 Conflicts: arch/arm/mach-ux500/board-mop500-sdi.c
-rw-r--r--arch/arm/mach-ux500/board-mop500-sdi.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index cd2eedd2fb1..836f8932cb8 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -105,7 +105,6 @@ static struct mmci_platform_data mop500_sdi0_data = {
* SDI1 (SDIO WLAN)
*/
#ifdef CONFIG_STE_DMA40
-#ifdef MMC_WITH_DMA
static struct stedma40_chan_cfg sdi1_dma_cfg_rx = {
.dir = STEDMA40_PERIPH_TO_MEM,
.src_dev_type = DB8500_DMA_DEV32_SD_MM1_RX,
@@ -122,7 +121,6 @@ static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
.dst_info.data_width = STEDMA40_WORD_WIDTH,
};
#endif
-#endif
/*
* Reconfigures a GPIO pin with a given number to either ALT_A or
@@ -175,7 +173,6 @@ static u32 sdi1_vdd_handler(struct device *dev, unsigned int vdd,
/*
* TODO 1: SDIO power management not fully supported.
- * TODO 2: SDIO with DMA not yet supported.
*/
static struct mmci_platform_data mop500_sdi1_data = {
.vdd_handler = sdi1_vdd_handler,
@@ -186,13 +183,11 @@ static struct mmci_platform_data mop500_sdi1_data = {
MMC_CAP_BROKEN_SDIO_CMD53,
.gpio_cd = -1,
.gpio_wp = -1,
-#ifdef MMC_WITH_DMA /* To be verified. */
#ifdef CONFIG_STE_DMA40
.dma_filter = stedma40_filter,
.dma_rx_param = &sdi1_dma_cfg_rx,
.dma_tx_param = &sdi1_dma_cfg_tx,
#endif
-#endif
};
#endif /* CONFIG_CW1200 */