From patchwork Thu Mar 24 01:30:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: manjugk manjugk X-Patchwork-Id: 657651 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 p2O1YONL006141 for ; Thu, 24 Mar 2011 01:34:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752255Ab1CXBeV (ORCPT ); Wed, 23 Mar 2011 21:34:21 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:51572 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751065Ab1CXBeU (ORCPT ); Wed, 23 Mar 2011 21:34:20 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p2O1YDth011103 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 23 Mar 2011 20:34:15 -0500 Received: from ucmsshproxy.india.ext.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with SMTP id p2O1YAlV009696; Thu, 24 Mar 2011 07:04:10 +0530 (IST) Received: from localhost (unknown [10.24.244.236]) by ucmsshproxy.india.ext.ti.com (Postfix) with ESMTP id 250BB158006; Thu, 24 Mar 2011 07:04:10 +0530 (IST) From: "G, Manjunath Kondaiah" To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: khilman@ti.com, paul@pwsan.com, tony@atomide.com Subject: [PATCH v3 4/4] OMAP: DMA: Fix: context restore during off mode Date: Thu, 24 Mar 2011 07:00:19 +0530 Message-Id: <1300930219-23160-5-git-send-email-manjugk@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1300930219-23160-1-git-send-email-manjugk@ti.com> References: <1300930219-23160-1-git-send-email-manjugk@ti.com> 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, 24 Mar 2011 01:34:30 +0000 (UTC) diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 3c39794..5c4ae7d 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -2059,29 +2059,20 @@ void omap_dma_global_context_save(void) pm_runtime_get_sync(dev); omap_dma_global_context.dma_irqenable_l0 = p->dma_read(IRQENABLE_L0, 0); - omap_dma_global_context.dma_ocp_sysconfig = - p->dma_read(OCP_SYSCONFIG, 0); omap_dma_global_context.dma_gcr = p->dma_read(GCR, 0); pm_runtime_put_autosuspend(dev); } void omap_dma_global_context_restore(void) { - int ch; - pm_runtime_get_sync(dev); p->dma_write(omap_dma_global_context.dma_gcr, GCR, 0); - p->dma_write(omap_dma_global_context.dma_ocp_sysconfig, - OCP_SYSCONFIG, 0); p->dma_write(omap_dma_global_context.dma_irqenable_l0, IRQENABLE_L0, 0); if (IS_DMA_ERRATA(DMA_ROMCODE_BUG)) p->dma_write(0x3 , IRQSTATUS_L0, 0); - for (ch = 0; ch < dma_chan_count; ch++) - if (dma_chan[ch].dev_id != -1) - omap_clear_dma(ch); pm_runtime_put_autosuspend(dev); }