From patchwork Thu May 5 11:51:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 756542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p45BptB9019203 for ; Thu, 5 May 2011 11:51:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752617Ab1EELvx (ORCPT ); Thu, 5 May 2011 07:51:53 -0400 Received: from smtp.nokia.com ([147.243.128.24]:46887 "EHLO mgw-da01.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752226Ab1EELvv (ORCPT ); Thu, 5 May 2011 07:51:51 -0400 Received: from nokia.com (localhost [127.0.0.1]) by mgw-da01.nokia.com (Switch-3.4.4/Switch-3.4.3) with ESMTP id p45BpkE6024101; Thu, 5 May 2011 14:51:46 +0300 Received: from localhost.localdomain ([[172.21.24.109]]) by mgw-da01.nokia.com with RELAY id p45BpO6t023786 ; Thu, 5 May 2011 14:51:46 +0300 From: Adrian Hunter To: Tony Lindgren Cc: Madhusudhan Chikkature , linux-omap Mailing List , linux-mmc Mailing List , linux-arm Mailing List , Adrian Hunter , Venkatraman S , Shilimkar Santosh , Tony Lindgren 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> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1304596282-4095-1-git-send-email-adrian.hunter@nokia.com> References: <1304596282-4095-1-git-send-email-adrian.hunter@nokia.com> X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 05 May 2011 11:51:55 +0000 (UTC) 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,