Skip to contentSkip to conversation

ARM: dts: imx6qdl-colibri: mux SD/MMC card detect explicitly

PATCH New Stefan Agner 2 participants 4 messages Jun 26, 2018 – Jul 1, 2018

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Stefan Agner

author
#0 lore raw

PATCH 1/3 ARM: dts: imx6qdl-colibri: mux SD/MMC card detect explicitly

Do not rely on reset/boot defaults and use a default GPIO setting with pull-up enabled.

Signed-off-by Stefan Agner <[email protected]>
---
 arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6qdl-colibri.dtsi +1 -1
index 76035db96f67..83d7c7d48c3f 100644
@@ -567,7 +567,7 @@
 
 	pinctrl_mmc_cd: gpiommccd {
 		fsl,pins = <
-			MX6QDL_PAD_NANDF_D5__GPIO2_IO05	0x80000000
+			MX6QDL_PAD_NANDF_D5__GPIO2_IO05	0x1b0b1
 		>;
 	};
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH 2/3 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 <[email protected]>
---
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 3 ---
 arch/arm/boot/dts/imx6qdl-colibri.dtsi       | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +0 -3
index 3dee3af1a4c1..9de45a717356 100644
@@ -221,9 +221,6 @@
 
 /* Colibri MMC */
 &usdhc1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_mmc_cd>;
-	cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
 	status = "okay";
 };
arch/arm/boot/dts/imx6qdl-colibri.dtsi +2 -1
index 83d7c7d48c3f..55c90c2fbf69 100644
@@ -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>;
Signature · 1 line
2.18.0
author
#2 lore raw

PATCH 3/3 ARM: dts: imx6qdl-colibri: use pull-down on wake-up pin

In reply to Stefan Agner

The wake-up pin is pulled low with 100kOhm on the carrier board. The current configuration of 100kOhm pull-up caused lots of interrupts, especially during boot up. Make sure the pin is at a reasonable level at startup by pulling it low on SoC side too.

Signed-off-by Stefan Agner <[email protected]>
---
 arch/arm/boot/dts/imx6qdl-colibri.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl-colibri.dtsi +1 -2
index 55c90c2fbf69..6e937ca20869 100644
@@ -480,8 +480,7 @@
 
 	pinctrl_gpio_keys: gpiokeys {
 		fsl,pins = <
-			/* Power button */
-			MX6QDL_PAD_EIM_A16__GPIO2_IO22		0x1b0b0
+			MX6QDL_PAD_EIM_A16__GPIO2_IO22		0x130b0
 		>;
 	};
Signature · 1 line
2.18.0