diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2021-03-24 17:27:34 +0100 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-03-25 10:24:51 +0000 |
| commit | 17be987ed70b5880f4c1404d175536f97c70343b (patch) | |
| tree | 408ff850eb832bb047fb60de010425ad20031eac | |
| parent | 2b6296bdcd769b7d7106f07d82d2238bc8f243c9 (diff) | |
ARM64: dts: apalis-imx8: use non-uhs sd-mode by default
By default the Apalis Carrier Boards do not support UHS modes. So use
high-speed mode by default but leave a note and code prepared for UHS usage.
Related-to: ELB-3867
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi index bad27276b308..a2ef38067313 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi @@ -1761,22 +1761,44 @@ /* Apalis MMC1 */ &usdhc2 { - bus-width = <8>; - cd-gpios = <&lsio_gpio2 9 GPIO_ACTIVE_LOW>; /* Apalis MMC1_CD# */ +/* + * 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 usdhc2's drivers control. + * However the by default placed pull-up resistors on SD data lines on Apalis + * Carrier Boards (except Ixora V1.2) are interfering with UHS's 1.8V signaling + * voltage. Remove those pull-ups on the carrier board for UHS usage. + */ +// #define SD_1_8 +#ifdef SD_1_8 pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_mmc1_cd>; pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_mmc1_cd>; pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_mmc1_cd>; +#else + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_mmc1_cd>; + no-1-8-v; +#endif + bus-width = <8>; + cd-gpios = <&lsio_gpio2 9 GPIO_ACTIVE_LOW>; /* Apalis MMC1_CD# */ }; /* Apalis SD1 */ &usdhc3 { - bus-width = <4>; - cd-gpios = <&lsio_gpio4 12 GPIO_ACTIVE_LOW>; /* Apalis SD1_CD# */ +// #define SD_1_8 +#ifdef SD_1_8 pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc3>, <&pinctrl_sd1_cd>; pinctrl-1 = <&pinctrl_usdhc3_100mhz>, <&pinctrl_sd1_cd>; pinctrl-2 = <&pinctrl_usdhc3_200mhz>, <&pinctrl_sd1_cd>; +#else + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>, <&pinctrl_sd1_cd>; + no-1-8-v; +#endif + bus-width = <4>; + cd-gpios = <&lsio_gpio4 12 GPIO_ACTIVE_LOW>; /* Apalis SD1_CD# */ }; &vpu_decoder { |