From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: [PATCH 03/22] OMAP: DMA: Ensure the sglist registers are cleared Date: Thu, 5 May 2011 14:51:03 +0300 Message-ID: <1304596282-4095-4-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 The new DMA descriptor auto-loading feature (referred to as sglist in the code) uses new registers. Ensure they are cleared. Signed-off-by: Adrian Hunter CC: Venkatraman S CC: Madhusudhan C CC: Shilimkar Santosh CC: Tony Lindgren --- arch/arm/plat-omap/dma.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 32a923a..a8264a0 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -1914,13 +1914,14 @@ void omap_clear_dma_sglist_mode(int lch) { /* Clear entire CDP which is related to sglist handling */ p->dma_write(0, CDP, lch); + p->dma_write(0, CNDP, lch); p->dma_write(0, CCDN, lch); - /** - * Put back the original enabled irqs, which - * could have been overwritten by type 1 or type 2 - * descriptors + /* + * CICR could have been overwritten by type 1 or type 2 + * descriptors. It is set up in omap_start_dma() anyway + * so just clear it to be on the safe side. */ - p->dma_write(dma_chan[lch].enabled_irqs, CICR, lch); + p->dma_write(0, CICR, lch); return; } EXPORT_SYMBOL(omap_clear_dma_sglist_mode); -- 1.7.0.4