Skip to contentSkip to conversation

Patch "ARM: dts: pxa: fix dma engine node to pxa3xx-nand" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 2, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: dts: pxa: fix dma engine node to pxa3xx-nand

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-dts-pxa-fix-dma-engine-node-to-pxa3xx-nand.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 07c6b2d01d351f0512ed7145625265e435ab3240 Mon Sep 17 00:00:00 2001

From: Robert Jarzmik <[email protected]>
Date: Sat, 13 Feb 2016 00:49:20 +0100
Subject: ARM: dts: pxa: fix dma engine node to pxa3xx-nand

From: Robert Jarzmik <[email protected]>

commit 07c6b2d01d351f0512ed7145625265e435ab3240 upstream.

Since the switch from mmp_pdma to pxa_dma driver for pxa architectures, the pxa_dma requires 2 arguments, namely the requestor line and the requested priority.

Fix the only left device node which was still passing only one argument, making the pxa3xx-nand driver misbehave in a device-tree configuration, ie. failing all data transfers.

Fixes c943646d1f49 ("ARM: dts: pxa: add dma engine node to pxa3xx-nand")
---
 arch/arm/boot/dts/pxa3xx.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa3xx.dtsi +1 -1
@@ -30,7 +30,7 @@
 			reg = <0x43100000 90>;
 			interrupts = <45>;
 			clocks = <&clks CLK_NAND>;
-			dmas = <&pdma 97>;
+			dmas = <&pdma 97 3>;
 			dma-names = "data";
 			#address-cells = <1>;
 			#size-cells = <1>;	

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/arm-dts-pxa-fix-dma-engine-node-to-pxa3xx-nand.patch queue-4.5/mtd-nand-pxa3xx_nand-fix-dmaengine-initialization.patch queue-4.5/dmaengine-pxa_dma-fix-the-maximum-requestor-line.patch