summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSanchayan Maity <maitysanchayan@gmail.com>2017-08-07 12:52:33 +0530
committerShawn Guo <shawnguo@kernel.org>2017-08-14 09:29:16 +0800
commitb5912b6f2b15112bb0905d27e88072ffef080e6c (patch)
tree6b2feb6a1de2bb8c7674e83b6cf3243c08d60c56 /arch
parent43f757bb234d506b0facfd6f989613d146c85133 (diff)
ARM: dts: imx6q-apalis-ixora: fix usdhc2 pinctrl property
The SD1 pinctrl-0 property is overridden but only the card detect pin is muxed, the control and data signals are not referenced at all. It worked because the bootloader muxed them to a sensible state though. Fix this. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6q-apalis-ixora.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 88cc7f51a4e9..89d99b4c6eed 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2016 Toradex AG
+ * Copyright 2014-2017 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*
@@ -268,7 +268,7 @@
/* SD1 */
&usdhc2 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_sd_cd>;
+ pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
status = "okay";
};