Skip to contentSkip to conversation

Patch "ARM: at91/dt: corrections to i2c1 declaration to sama5d4" has been added to the 4.2-stable tree

PATCH [email protected] 1 participant 1 message Dec 6, 2015

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: at91/dt: corrections to i2c1 declaration to sama5d4

to the 4.2-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-at91-dt-corrections-to-i2c1-declaration-to-sama5d4.patch
and it can be found in the queue-4.2 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 d1a9c24ad16ab2b26f1574bc3f2c165a7beff5df Mon Sep 17 00:00:00 2001

From: Holger Busse <[email protected]>
Date: Wed, 26 Aug 2015 10:45:45 +0200
Subject: ARM: at91/dt: corrections to i2c1 declaration to sama5d4

From: Holger Busse <[email protected]>

commit d1a9c24ad16ab2b26f1574bc3f2c165a7beff5df upstream.

Correcting the dma declaration for i2c1 dma.

Fixes 4cc7cdf35c5f ("ARM: at91/dt: add i2c1 declaration to sama5d4")
---
 arch/arm/boot/dts/sama5d4.dtsi |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/sama5d4.dtsi +4 -4
@@ -939,11 +939,11 @@
 				reg = <0xf8018000 0x4000>;
 				interrupts = <33 IRQ_TYPE_LEVEL_HIGH 6>;
 				dmas = <&dma1
-					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
-					AT91_XDMAC_DT_PERID(4)>,
+					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+					| AT91_XDMAC_DT_PERID(4))>,
 				       <&dma1
-					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
-					AT91_XDMAC_DT_PERID(5)>;
+					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+					| AT91_XDMAC_DT_PERID(5))>;
 				dma-names = "tx", "rx";
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_i2c1>;

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

queue-4.2/arm-at91-dt-corrections-to-i2c1-declaration-to-sama5d4.patch