summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>2017-05-22 11:01:52 +0200
committerTony Lindgren <tony@atomide.com>2017-05-26 08:24:52 -0700
commit56b74ed9c1e8050408b9beeee25888a49a458997 (patch)
tree10da70dd25572de127e8fe19530bb519fd36e504
parentbca5238816939436d72ae6bab124c4b0641a3a99 (diff)
downloadlinux-stable-56b74ed9c1e8050408b9beeee25888a49a458997.tar.gz
linux-stable-56b74ed9c1e8050408b9beeee25888a49a458997.tar.bz2
linux-stable-56b74ed9c1e8050408b9beeee25888a49a458997.zip
ARM: dts: am335x-sl50: Fix card detect pin for mmc1
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.") Cc: <stable@vger.kernel.org> # 4.11 Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/boot/dts/am335x-sl50.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index c5d2589c55fc..da4f8e376b9f 100644
--- 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>;
};