[PATCH] dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Peter Ujfalusi <peter.ujfalusi@ti.com>
Newsgroups	linux.kernel
Subject	[PATCH] dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type
Date	Fri, 19 May 2017 11:20:02 +0200
Message-ID	<tIMeK-8ro-19@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1495185433; bh=tJgGprPqY0vWbo5WudxVlZ/IJLyU21HXO51M0nLTXbE=; h=From:To:CC:Subject:Date; b=yYkh0mqBE0+o3T4MDDblhvTEC1rLaqfFOoW2uNX5UAMt6ZMJWfZ7HnkEF+n12wQ+G EcPVUMOhKOtQvVnbsN3n6A6+1WmMgGAijFXgykhcVPdPXDG+LdeSbCA4Punr3+TPGe xHLOzBdvSmmkNkHEoAJN26YeFMhsTf+LvMYE7/+g=
X-Mailer	git-send-email 2.13.0
MIME-Version	1.0
Content-Type	text/plain
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	44
Organization	linux.* mail to news gateway
X-Original-Cc	<dmaengine@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>
X-Original-Date	Fri, 19 May 2017 12:17:27 +0300
X-Original-Message-ID	<20170519091727.3239-1-peter.ujfalusi@ti.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1645453

Show key headers only | View raw

The used 0x1f mask is only valid for am335x family of SoC, different family
using this type of crossbar might have different number of electable
events. In case of am43xx family 0x3f mask should have been used for
example.
Instead of trying to handle each family's mask, just use u8 type to store
the mux value since the event offsets are aligned to byte offset.

Fixes: 42dbdcc6bf965 ("dmaengine: ti-dma-crossbar: Add support for crossbar on AM33xx/AM43xx")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 drivers/dma/ti-dma-crossbar.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c
index 2403475a37cf..aaff35292c7d 100644
--- a/drivers/dma/ti-dma-crossbar.c
+++ b/drivers/dma/ti-dma-crossbar.c
@@ -49,12 +49,12 @@ struct ti_am335x_xbar_data {
 
 struct ti_am335x_xbar_map {
 	u16 dma_line;
-	u16 mux_val;
+	u8 mux_val;
 };
 
-static inline void ti_am335x_xbar_write(void __iomem *iomem, int event, u16 val)
+static inline void ti_am335x_xbar_write(void __iomem *iomem, int event, u8 val)
 {
-	writeb_relaxed(val & 0x1f, iomem + event);
+	writeb_relaxed(val, iomem + event);
 }
 
 static void ti_am335x_xbar_free(struct device *dev, void *route_data)
@@ -105,7 +105,7 @@ static void *ti_am335x_xbar_route_allocate(struct of_phandle_args *dma_spec,
 	}
 
 	map->dma_line = (u16)dma_spec->args[0];
-	map->mux_val = (u16)dma_spec->args[2];
+	map->mux_val = (u8)dma_spec->args[2];
 
 	dma_spec->args[2] = 0;
 	dma_spec->args_count = 2;
-- 
2.13.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type Peter Ujfalusi <peter.ujfalusi@ti.com> - 2017-05-19 11:20 +0200

csiph-web