Skip to contentSkip to conversation

ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc.

PATCH New Denis Carikli 2 participants 3 messages Jun 18, 2014 – Jun 21, 2014

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

Denis Carikli

author
#0 lore raw

PATCH 1/1 ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc.

The following commit:
89d7e5c mmc: sdhci-esdhc-imx: add runtime pm support has the effect of also disabling the hardware card detect in runtime pm.

We switch to GPIO based detection to avoid this issue.

This patch is based on:
ARM: dts: imx51-babbage: Fix esdhc setup

Signed-off-by Denis Carikli <[email protected]>
---
 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +3 -1
index 75e66c9..1d77381 100644
@@ -108,6 +108,8 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>;
 	fsl,cd-controller;
+	cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+
 	status = "okay";
 };
 

@@ -206,7 +208,7 @@
 
 		pinctrl_esdhc1_cd: esdhc1_cd {
 			fsl,pins = <
-				MX51_PAD_GPIO1_0__SD1_CD 0x20d5
+				MX51_PAD_GPIO1_0__GPIO1_0 0xd5
 			>;
 		};
Signature · 1 line
1.7.9.5
Applied
#1 lore raw

PATCH 1/1 ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc.

Quoted 11 lines · Denis Carikli

The following commit:
89d7e5c mmc: sdhci-esdhc-imx: add runtime pm support has the effect of also disabling the hardware card detect in runtime pm.

We switch to GPIO based detection to avoid this issue.

This patch is based on:
ARM: dts: imx51-babbage: Fix esdhc setup

Signed-off-by Denis Carikli <[email protected]>

Applied, thanks.

#2 lore raw

PATCH 1/1 ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc.

In reply to Denis Carikli
Quoted 20 lines · Denis Carikli

The following commit:
89d7e5c mmc: sdhci-esdhc-imx: add runtime pm support has the effect of also disabling the hardware card detect in runtime pm.

We switch to GPIO based detection to avoid this issue.

This patch is based on:
ARM: dts: imx51-babbage: Fix esdhc setup

Signed-off-by Denis Carikli <[email protected]>
---
 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +0 -0
index 75e66c9..1d77381 100644

arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts line 110

Quoted 3 lines
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +0 -0
@@ -108,6 +108,8 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>;
 	fsl,cd-controller;

The property should be dropped now.

arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts line 112

Quoted 2 lines
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +2 -0
+	cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+

This new line is not really necessary.

I fixed them up when applying.

Shawn

Quoted 15 lines
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +1 -1
 	status = "okay";
 };
 

@@ -206,7 +208,7 @@
 
 		pinctrl_esdhc1_cd: esdhc1_cd {
 			fsl,pins = <
-				MX51_PAD_GPIO1_0__SD1_CD 0x20d5
+				MX51_PAD_GPIO1_0__GPIO1_0 0xd5
 			>;
 		};
Signature · 1 line
1.7.9.5