[PATCH 05/22] mmc: omap_hsmmc: fix dma sglist use
From: Adrian Hunter <hidden>
Date: 2011-05-05 11:51:05
Also in:
linux-mmc, linux-omap
Subsystem:
multimedia card (mmc), secure digital (sd) and sdio subsystem, omap hs mmc support, the rest · Maintainers:
Ulf Hansson, Linus Torvalds
Allow for the super block end event used by sglist DMA transfers and tidy the detection of the DMA sglist feature. Signed-off-by: Adrian Hunter <redacted> CC: Venkatraman S <redacted> CC: Madhusudhan C <redacted> CC: Shilimkar Santosh <redacted> CC: Tony Lindgren <tony@atomide.com> --- drivers/mmc/host/omap_hsmmc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index ebcef31..114cd68 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c@@ -1333,7 +1333,7 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data) struct mmc_data *data = host->mrq->data; int dma_ch, req_in_progress; - if (!(ch_status & OMAP_DMA_BLOCK_IRQ)) { + if (!(ch_status & (OMAP_DMA_BLOCK_IRQ | OMAP2_DMA_SUPER_BLOCK_IRQ))) { dev_warn(mmc_dev(host->mmc), "unexpected dma status %x\n", ch_status); return;
@@ -2230,7 +2230,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) " clk failed\n"); } - if (cpu_is_omap44xx() || cpu_is_omap3630()) { + if (omap_dma_has_sglist_mode()) { host->dma_ctrl_buf = dma_alloc_coherent(NULL, DMA_CTRL_BUF_SIZE, &host->dma_ctrl_buf_phy,
--
1.7.0.4