diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-14 16:37:55 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-25 21:13:36 +0200 |
| commit | 6a764c4efafeb06505bc25c0cd96c23c64147103 (patch) | |
| tree | d281209ffdbf73c9ef22e096c45da597d9c48e41 /arch/arm/boot/dts/imx6qdl-colibri.dtsi | |
| parent | 0021a0c8a58ff37f62f4d2424dca7c6a6d9f233d (diff) | |
arm: dts: colibri-imx6: clean-up sd card dts
Keep +3.3V pull-ups interface by default in imx6qdl-colibri.dtsi.
Clean-up Iris V2.0 carrier board device tree.
UHS mode can be supported on Iris V2.0, where no SD pull-ups populated,
but not enabled to provide backward compatibility with
Colibri iMX6 rev1.0, without populated vgen3 LDO
Removed disable-wp as WP is not connected to GPIO.
Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-colibri.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index b31c2e6f7e20..79f003938e5b 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -751,34 +751,18 @@ /* Colibri MMC */ &usdhc1 { -/* - * The define SD_1_8 allows to use the SD interface at a higher speed mode - * if the card supports it. For this the signaling voltage is switched from - * 3.3V to 1.8V under the usdhc1's drivers control which is supported starting - * with hardware revision V1.1A. - */ -#ifdef SD_1_8 - pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>; pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_mmc_cd>; pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_mmc_cd>; - vqmmc-supply = <&vgen3_reg>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; -#else - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>; - no-1-8-v; -#endif + pinctrl-3 = <&pinctrl_usdhc1_sleep &pinctrl_mmc_cd_sleep>; label = "MMC1"; + bus-width = <4>; cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */ - disable-wp; enable-sdio-wakeup; keep-power-in-suspend; - vmmc-supply = <®_3p3v>; - bus-width = <4>; + no-1-8-v; + vqmmc-supply = <&vgen3_reg>; status = "disabled"; }; @@ -1179,6 +1163,23 @@ >; }; + pinctrl_mmc_cd_sleep: gpiommccdgrpslp { + fsl,pins = < + MX6QDL_PAD_NANDF_D5__GPIO2_IO05 0x0 + >; + }; + + pinctrl_usdhc1_sleep: usdhc1grp_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 + >; + }; + pinctrl_usdhc3: usdhc3grp { fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 |