Patch "ARM: dts: am335x-sl50: Fix card detect pin for mmc1" has been added to the 4.11-stable tree

Patch "ARM: dts: am335x-sl50: Fix card detect pin for mmc1" has been added to the 4.11-stable tree

[gregkh]

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

    ARM: dts: am335x-sl50: Fix card detect pin for mmc1

to the 4.11-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-am335x-sl50-fix-card-detect-pin-for-mmc1.patch
and it can be found in the queue-4.11 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 56b74ed9c1e8050408b9beeee25888a49a458997 Mon Sep 17 00:00:00 2001
From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Date: Mon, 22 May 2017 11:01:52 +0200
Subject: ARM: dts: am335x-sl50: Fix card detect pin for mmc1

From: Enric Balletbo i Serra <enric.balletbo@collabora.com>

commit 56b74ed9c1e8050408b9beeee25888a49a458997 upstream.

The second version of the hardware moved the card detect pin from gpio0_6
to gpio1_9, as we won't support the first hardware version fix the pinmux
configuration of this pin.

Fixes: 8584d4fc ("ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support.")
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm/boot/dts/am335x-sl50.dts |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/arm/boot/dts/am335x-sl50.dts
+++ b/arch/arm/boot/dts/am335x-sl50.dts
@@ -220,7 +220,7 @@
 
 	mmc1_pins: pinmux_mmc1_pins {
 		pinctrl-single,pins = <
-			AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7)		/* spi0_cs1.gpio0_6 */
+			AM33XX_IOPAD(0x96c, PIN_INPUT | MUX_MODE7)		/* uart0_rtsn.gpio1_9 */
 		>;
 	};
 
@@ -384,7 +384,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc1_pins>;
 	bus-width = <4>;
-	cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+	cd-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
 	vmmc-supply = <&vmmcsd_fixed>;
 };
 


Patches currently in stable-queue which might be from enric.balletbo@collabora.com are

queue-4.11/arm-dts-am335x-sl50-fix-card-detect-pin-for-mmc1.patch
queue-4.11/arm-dts-am335x-sl50-fix-cannot-claim-requested-pins-for-spi0.patch