diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.2.dtsi | 22 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 |
2 files changed, 23 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.2.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.2.dtsi index faf841eecb42..ed5474fc878c 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.2.dtsi @@ -354,6 +354,24 @@ MX6QDL_PAD_EIM_DA15__GPIO3_IO15 PAD_CTRL_HYS_PU >; }; + + pinctrl_mmc_cd_sleep: gpiommccdgrpslp { + fsl,pins = < + /* MMC1 CD */ + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x0 + >; + }; + + pinctrl_usdhc1_4bit_sleep: usdhc1grp_4bit_sleep { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x3000 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x3000 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x3000 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x3000 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x3000 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x3000 + >; + }; }; &lcd { @@ -466,9 +484,11 @@ /* MMC1 */ &usdhc1 { - pinctrl-names = "default"; + pinctrl-names = "default", "sleep"; pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; + pinctrl-1 = <&pinctrl_usdhc1_4bit_sleep &pinctrl_mmc_cd_sleep>; bus-width = <4>; status = "okay"; + cap-power-off-card; vmmc-supply = <®_3v3_vmmc>; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index f65028c8911f..59e1677574d7 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -715,8 +715,8 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; - enable-sdio-wakeup; - keep-power-in-suspend; + //enable-sdio-wakeup; + //keep-power-in-suspend; vqmmc-supply = <®_3p3v>; bus-width = <8>; voltage-ranges = <3300 3300>; |