From: Venkatraman S <svenkatr@ti.com>
To: linux-omap@vger.kernel.org
Cc: thara@ti.com, Tony Lindgren <tony@atomide.com>,
Santosh Shilimkar <santosh.shilimkar@ti.com>
Subject: [PATCH] dma: fix scope of errata i88 upto 3430ES1.0
Date: Fri, 2 Apr 2010 17:05:15 +0530 [thread overview]
Message-ID: <w2g618f0c911004020435qd281c5deoc3e0ade84cc2d0b1@mail.gmail.com> (raw)
DMA errata for special end of block programming is applicable
only for OMAP2430 & OMAP3430 ES1.0.
This patch does the necessary checks before the workaround
is applied. Tested on 3430 SDP
Signed-off-by: Thara Gopinath <thara@ti.com>
Signed-off-by: Venkatraman S <svenkatr@ti.com>
---
arch/arm/plat-omap/dma.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 2ab224c..ef965ac 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1663,14 +1663,18 @@ int omap_stop_dma_chain_transfers(int chain_id)
channels = dma_linked_lch[chain_id].linked_dmach_q;
/*
- * DMA Errata:
- * Special programming model needed to disable DMA before end of block
+ * DMA Errata: i88
+ * Special programming model needed
+ * to disable DMA before end of block
*/
sys_cf = dma_read(OCP_SYSCONFIG);
- l = sys_cf;
- /* Middle mode reg set no Standby */
- l &= ~((1 << 12)|(1 << 13));
- dma_write(l, OCP_SYSCONFIG);
+ if (cpu_is_omap2430() || (cpu_is_omap3430() &&
+ omap_rev() == OMAP3430_REV_ES1_0)) {
+ l = sys_cf;
+ /* Middle mode reg set no Standby */
+ l &= ~((1 << 12)|(1 << 13));
+ dma_write(l, OCP_SYSCONFIG);
+ }
for (i = 0; i < dma_linked_lch[chain_id].no_of_lchs_linked; i++) {
@@ -1689,8 +1693,10 @@ int omap_stop_dma_chain_transfers(int chain_id)
/* Reset the Queue pointers */
OMAP_DMA_CHAIN_QINIT(chain_id);
- /* Errata - put in the old value */
- dma_write(sys_cf, OCP_SYSCONFIG);
+ /* Errata: put back the old value */
+ if (cpu_is_omap2430() || (cpu_is_omap3430() &&
+ omap_rev() == OMAP3430_REV_ES1_0))
+ dma_write(sys_cf, OCP_SYSCONFIG);
return 0;
}
--
1.6.3.3
next reply other threads:[~2010-04-02 11:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-02 11:35 Venkatraman S [this message]
2010-04-05 14:26 ` [PATCH] dma: fix scope of errata i88 upto 3430ES1.0 Shilimkar, Santosh
2010-04-05 15:19 ` Venkatraman S
2010-04-05 15:36 ` [PATCH v2] " Venkatraman S
2010-04-19 10:51 ` Venkatraman S
2010-04-21 21:14 ` Tony Lindgren
2010-04-26 14:51 ` Venkatraman S
2010-05-03 16:35 ` Tony Lindgren
2010-05-04 6:50 ` Venkatraman S
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=w2g618f0c911004020435qd281c5deoc3e0ade84cc2d0b1@mail.gmail.com \
--to=svenkatr@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=thara@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).