public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: linux-omap@vger.kernel.org, Anand Gadiyar <gadiyar@ti.com>
Subject: [PATCH 06/10] ARM: OMAP: Fix DMA CCR programming for request line > 63
Date: Mon, 12 Jan 2009 16:44:53 +0200	[thread overview]
Message-ID: <20090112144453.24205.18451.stgit@localhost> (raw)
In-Reply-To: <20090112143405.24205.52151.stgit@localhost>

From: Anand Gadiyar <gadiyar@ti.com>

Bug in existing code causes synchro control to be set +32 if request
line greater than 63 is used.

Reported by Wenbiao Wang

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/plat-omap/dma.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 692d2b4..6152586 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -279,10 +279,7 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,
 
 		val = dma_read(CCR(lch));
 		val &= ~(3 << 19);
-		if (dma_trigger > 63)
-			val |= 1 << 20;
-		if (dma_trigger > 31)
-			val |= 1 << 19;
+		val |= ((dma_trigger & ~(0x1f)) << 14);
 
 		val &= ~(0x1f);
 		val |= (dma_trigger & 0x1f);


  parent reply	other threads:[~2009-01-12 14:44 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-12 14:37 [PATCH 00/10] Omap fixes for 2.6.29-rc1 Tony Lindgren
2009-01-12 14:38 ` [PATCH 01/10] ARM: OMAP: Fix compile for various McBSP Tony Lindgren
2009-01-12 14:39 ` [PATCH 02/10] ARM: OMAP: Fix compile for palmte Tony Lindgren
2009-01-12 14:41 ` [PATCH 03/10] ARM: OMAP: Fix gpio by switching to generic gpio calls, v2 Tony Lindgren
2009-01-12 14:42 ` [PATCH 04/10] ARM: OMAP: Fix compile for beagle Tony Lindgren
2009-01-12 14:43 ` [PATCH 05/10] ARM: OMAP: Fix gpio.c compile on 15xx with CONFIG_DEBUGFS Tony Lindgren
2009-01-12 14:44 ` Tony Lindgren [this message]
2009-01-12 14:59   ` [PATCH 06/10] ARM: OMAP: Fix DMA CCR programming for request line > 63 Gadiyar, Anand
2009-01-12 15:35     ` Tony Lindgren
2009-01-12 15:58       ` Russell King - ARM Linux
2009-01-12 16:01       ` Russell King - ARM Linux
2009-01-12 16:10         ` [PATCH 06/10] ARM: OMAP: Fix DMA CCR programming for request line > 63, v2 Tony Lindgren
2009-01-12 16:16           ` Russell King - ARM Linux
2009-01-12 16:40             ` Tony Lindgren
2009-01-12 16:42               ` Russell King - ARM Linux
2009-01-15 12:08                 ` Tony Lindgren
2009-01-12 14:46 ` [PATCH 07/10] ARM: OMAP: remove duplicated #include's Tony Lindgren
2009-01-12 14:47 ` [PATCH 08/10] ARM: OMAP: Fix OSK ASoC by registering I2C board info for tlvaic23 Tony Lindgren
2009-01-12 14:48 ` [PATCH 09/10] ARM: OMAP: Fix ASoC by enabling writes to XCCR and RCCR McBSP registers Tony Lindgren
2009-01-12 14:50 ` [PATCH 10/10] ARM: OMAP: Remove unused platform devices for old ALSA code Tony Lindgren
2009-01-15 12:11   ` Tony Lindgren
2009-01-15 13:10     ` [PATCH 10/10] ARM: OMAP: Remove unused platform devices, v3 Tony Lindgren
2009-01-15 12:13   ` [PATCH 11/10] ARM: OMAP: Fix compile for h3 MMC Tony Lindgren
2009-01-13 14:35 ` git-pull request for omap-fixes for 2.6.29-rc1 (Re: [PATCH 00/10] Omap fixes for 2.6.29-rc1) Tony Lindgren
2009-01-15 10:37   ` Russell King - ARM Linux
2009-01-15 11:13     ` David Brownell
2009-01-15 11:26     ` Tony Lindgren
2009-01-15 12:40       ` Russell King - ARM Linux
2009-01-15 13:15         ` Felipe Balbi
2009-01-15 13:34           ` Russell King - ARM Linux
2009-01-15 14:49             ` Alan Stern
2009-01-15 15:16               ` Russell King - ARM Linux
2009-01-15 13:37         ` Tony Lindgren
2009-01-15 13:49           ` Russell King - ARM Linux
2009-01-17 14:26             ` Russell King - ARM Linux
2009-01-17 20:47               ` David Brownell
2009-01-18 11:40                 ` Tony Lindgren
2009-01-18 11:42                   ` Russell King - ARM Linux

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=20090112144453.24205.18451.stgit@localhost \
    --to=tony@atomide.com \
    --cc=gadiyar@ti.com \
    --cc=linux-arm-kernel@lists.arm.linux.org.uk \
    --cc=linux-omap@vger.kernel.org \
    /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