Skip to content

Commit dacf492

Browse files
saschahauerShawn Guo
authored andcommitted
ARM: dts: imx51-babbage: Fix esdhc setup
Since commit 89d7e5c (mmc: sdhci-esdhc-imx: add runtime pm support), controller based card detection / write protection is not supported anymore by esdhc driver. Let's use GPIO for CD/WP on esdhc1 instead. While at it, fix cd gpio polarity for esdhc2. This is wrong and currently only works because the imx esdhc driver ignores the polarity. Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent be149c7 commit dacf492

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/arm/boot/dts/imx51-babbage.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,15 @@
315315
&esdhc1 {
316316
pinctrl-names = "default";
317317
pinctrl-0 = <&pinctrl_esdhc1>;
318-
fsl,cd-controller;
319-
fsl,wp-controller;
318+
cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
319+
wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
320320
status = "okay";
321321
};
322322

323323
&esdhc2 {
324324
pinctrl-names = "default";
325325
pinctrl-0 = <&pinctrl_esdhc2>;
326-
cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
326+
cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
327327
wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
328328
status = "okay";
329329
};
@@ -468,8 +468,8 @@
468468
MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
469469
MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
470470
MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
471-
MX51_PAD_GPIO1_0__SD1_CD 0x20d5
472-
MX51_PAD_GPIO1_1__SD1_WP 0x20d5
471+
MX51_PAD_GPIO1_0__GPIO1_0 0x100
472+
MX51_PAD_GPIO1_1__GPIO1_1 0x100
473473
>;
474474
};
475475

0 commit comments

Comments
 (0)