From 9f63fe809c884540a7ab03407d3d1c2ec2eec585 Mon Sep 17 00:00:00 2001 From: Francesco Dolcini Date: Fri, 24 Sep 2021 13:50:17 +0200 Subject: arm64: dts: apalis-imx8: Add 1v8 SD support Fix UHS 1v8 mode support for Apalis iMX8 board enabling complete USDHC functionality on the SoM dtsi file, but disable 1.8V card voltage for Apalis Evaluation board and Ixora 1.1 where pull-up to 3.3V are present. Enable usdhc pinctrl definition for high speed mode on Ixora 1.2 dts. With these changes UHS104 is working fine on Ixora 1.2. Signed-off-by: Francesco Dolcini Fixes: 17be987ed70b ("ARM64: dts: apalis-imx8: use non-uhs sd-mode by default") --- .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi') 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 7befeac7a834..b8ad25967bfd 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi @@ -1788,42 +1788,20 @@ /* Apalis MMC1 */ &usdhc2 { -/* - * 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 { -// #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# */ }; -- cgit v1.2.3