From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: [PATCH 05/22] mmc: omap_hsmmc: fix dma sglist use Date: Thu, 5 May 2011 14:51:05 +0300 Message-ID: <1304596282-4095-6-git-send-email-adrian.hunter@nokia.com> References: <1304596282-4095-1-git-send-email-adrian.hunter@nokia.com> Return-path: In-Reply-To: <1304596282-4095-1-git-send-email-adrian.hunter@nokia.com> Sender: linux-mmc-owner@vger.kernel.org Cc: Madhusudhan Chikkature , linux-omap Mailing List , linux-mmc Mailing List , linux-arm Mailing List , Adrian Hunter , Venkatraman S , Shilimkar Santosh , Tony Lindgren List-Id: linux-omap@vger.kernel.org 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 CC: Venkatraman S CC: Madhusudhan C CC: Shilimkar Santosh CC: Tony Lindgren --- 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