public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
To: Mans Rullgard <mans@mansr.com>, Vinod Koul <vinod.koul@intel.com>
Cc: <dmaengine@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	Sebastian Frias <sf84@laposte.net>, Mason <slash.tmp@free.fr>,
	Thibaud Cornic <thibaud_cornic@sigmadesigns.com>
Subject: [PATCH 4/6] Fixup tangox_dma_sbox_map
Date: Wed, 23 Nov 2016 17:51:53 +0100	[thread overview]
Message-ID: <5835C929.4020100@sigmadesigns.com> (raw)
In-Reply-To: <5835C84A.6000706@sigmadesigns.com>

---
 drivers/dma/tango-dma.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/tango-dma.c b/drivers/dma/tango-dma.c
index 6a32d234ffb0..5250c053a7b9 100644
--- a/drivers/dma/tango-dma.c
+++ b/drivers/dma/tango-dma.c
@@ -108,11 +108,11 @@ static struct tangox_dma_desc *tangox_dma_alloc_desc(unsigned int num_sgs)
 
 static void tangox_dma_sbox_map(struct tangox_dma_device *dev, int src, int dst)
 {
-	void __iomem *addr = dev->sbox_base + 8;
+	void __iomem *addr = dev->sbox_base + SBOX_ROUTE;
 	int shift = (dst - 1) * 4;
 
-	if (shift > 31) {
-		addr += 4;
+	if (dst > 8) {
+		addr = dev->sbox_base + SBOX_ROUTE2;
 		shift -= 32;
 	}
 
-- 
2.9.0

  parent reply	other threads:[~2016-11-23 17:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-23 16:48 Driver for tango DMA engine Marc Gonzalez
2016-11-23 16:49 ` [PATCH 1/6] dmaengine: Import tango MBUS driver Marc Gonzalez
2016-11-23 16:50 ` [PATCH 2/6] Provide names for SBOX register offsets Marc Gonzalez
2016-11-23 16:51 ` [PATCH 3/6] Fixup for tango4 support Marc Gonzalez
2016-11-23 16:51 ` Marc Gonzalez [this message]
2016-11-23 16:56 ` [PATCH 5/6] Fixup tangox_dma_reset Marc Gonzalez
2016-11-23 16:56 ` [PATCH 6/6] Relax write accesses Marc Gonzalez
2016-11-23 17:27 ` Driver for tango DMA engine Måns Rullgård

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=5835C929.4020100@sigmadesigns.com \
    --to=marc_gonzalez@sigmadesigns.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mans@mansr.com \
    --cc=sf84@laposte.net \
    --cc=slash.tmp@free.fr \
    --cc=thibaud_cornic@sigmadesigns.com \
    --cc=vinod.koul@intel.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