Patch "ARM: dts: dra7x-evm: Prevent glitch on DCAN1 pinmux" has been added to the 4.1-stable tree

Patch "ARM: dts: dra7x-evm: Prevent glitch on DCAN1 pinmux" has been added to the 4.1-stable tree

[gregkh]

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

    ARM: dts: dra7x-evm: Prevent glitch on DCAN1 pinmux

to the 4.1-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-dra7x-evm-prevent-glitch-on-dcan1-pinmux.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 2acb5c301edf39ab6d066687ce70da1166e4de9e Mon Sep 17 00:00:00 2001
From: Roger Quadros <rogerq@ti.com>
Date: Tue, 7 Jul 2015 17:27:57 +0300
Subject: ARM: dts: dra7x-evm: Prevent glitch on DCAN1 pinmux

From: Roger Quadros <rogerq@ti.com>

commit 2acb5c301edf39ab6d066687ce70da1166e4de9e upstream.

Driver core sets "default" pinmux on on probe and CAN driver
sets "sleep" pinmux during register. This causes a small window
where the CAN pins are in "default" state with the DCAN module
being disabled.

Change the "default" state to be like sleep so this glitch is
avoided. Add a new "active" state that is used by the driver
when CAN is actually active.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm/boot/dts/dra7-evm.dts  |    5 +++--
 arch/arm/boot/dts/dra72-evm.dts |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -686,7 +686,8 @@
 
 &dcan1 {
 	status = "ok";
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&dcan1_pins_default>;
+	pinctrl-names = "default", "sleep", "active";
+	pinctrl-0 = <&dcan1_pins_sleep>;
 	pinctrl-1 = <&dcan1_pins_sleep>;
+	pinctrl-2 = <&dcan1_pins_default>;
 };
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -497,9 +497,10 @@
 
 &dcan1 {
 	status = "ok";
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&dcan1_pins_default>;
+	pinctrl-names = "default", "sleep", "active";
+	pinctrl-0 = <&dcan1_pins_sleep>;
 	pinctrl-1 = <&dcan1_pins_sleep>;
+	pinctrl-2 = <&dcan1_pins_default>;
 };
 
 &qspi {


Patches currently in stable-queue which might be from rogerq@ti.com are

queue-4.1/arm-dts-am57xx-beagle-x15-provide-supply-for-usb2_phy2.patch
queue-4.1/can-c_can-fix-default-pinmux-glitch-at-init.patch
queue-4.1/arm-dts-dra7x-evm-prevent-glitch-on-dcan1-pinmux.patch