summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx6qdl-colibri.dtsi
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2018-06-26 16:52:42 +0200
committerShawn Guo <shawnguo@kernel.org>2018-07-01 15:22:59 +0200
commitc768224360094b3e3b11c81a4163a9e1c7bd3336 (patch)
treed2252279a1e4cebbd4d0854151f37367234105c0 /arch/arm/boot/dts/imx6qdl-colibri.dtsi
parentARM: dts: imx6qdl-colibri: mux SD/MMC card detect explicitly (diff)
downloadlinux-c768224360094b3e3b11c81a4163a9e1c7bd3336.tar.xz
linux-c768224360094b3e3b11c81a4163a9e1c7bd3336.zip
ARM: dts: imx6qdl-colibri: move card detect to module device tree
Muxing the card detect only in the carrier board device tree overwrites the USDHC muxing in the module level device tree. Move card detect to the module level device tree since this is also a default pinout of the Colibri standard. If a carrier board requires a different setting it still can overwrite the nodes in the carrier board specific device tree. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-colibri.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl-colibri.dtsi3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 83d7c7d48c3f..55c90c2fbf69 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -385,7 +385,8 @@
/* Colibri MMC */
&usdhc1 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc1>;
+ pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
+ cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
vqmmc-supply = <&reg_3p3v>;
bus-width = <4>;
voltage-ranges = <3300 3300>;