diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-14 19:58:03 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-25 21:14:16 +0200 |
| commit | 15540f62965934564640335afbc9e6004cf06b30 (patch) | |
| tree | 88a79a396289f5b27d76544e1ee475a8e9993b05 /arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | |
| parent | 6a764c4efafeb06505bc25c0cd96c23c64147103 (diff) | |
arm: dts: colibri-imx7: clean-up sd card dts
Keep +3.3V pull-ups interface by default in SOM DTSI imx7-colibri.dtsi
SD card interface setting per board device tree:
imx7-colibri-aster.dtsi +3.3V pull-ups
imx7-colibri-eval-3.dtsi +3.3V pull-ups
imx7-colibri-iris.dtsi +3.3V pull-ups
imx7-colibri-iris-v2.dtsi 1.8V signaling, no pull-ups, UHS capable
Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi index f2ebe9f53f91..190549461610 100644 --- a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi @@ -144,56 +144,10 @@ status = "okay"; }; -/* 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. - * All pins supplied with NVCC_SD1 must be able to cope with this - * and must (MUST!!!) not be driven with a voltage higher than 1.8V or - * the interface will not work. - */ -#define SD_1_8 &usdhc1 { -#ifdef SD_1_8 - pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_cd_usdhc1>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_cd_usdhc1>; - pinctrl-3 = <&pinctrl_usdhc1_sleep &pinctrl_cd_usdhc1_sleep>; - vqmmc-supply = <®_LDO2>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; -#else - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; - pinctrl-1 = <&pinctrl_usdhc1_sleep &pinctrl_cd_usdhc1_sleep>; - no-1-8-v; -#endif - cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; - disable-wp; - enable-sdio-wakeup; cap-power-off-card; - wakeup-source; + /delete-property/ keep-power-in-suspend; + /delete-property/ no-1-8-v; vmmc-supply = <®_3v3_vmmc>; status = "okay"; }; - -&iomuxc { - pinctrl_usdhc1_sleep: usdhc1-slp-grp { - fsl,pins = < - MX7D_PAD_SD1_CMD__SD1_CMD 0x10 - MX7D_PAD_SD1_CLK__SD1_CLK 0x10 - MX7D_PAD_SD1_DATA0__SD1_DATA0 0x10 - MX7D_PAD_SD1_DATA1__SD1_DATA1 0x10 - MX7D_PAD_SD1_DATA2__SD1_DATA2 0x10 - MX7D_PAD_SD1_DATA3__SD1_DATA3 0x10 - >; - }; - - pinctrl_cd_usdhc1_sleep: usdhc1-cd-slp-grp { - fsl,pins = < - MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x0 /* CD */ - >; - }; -}; |