diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-18 12:10:35 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-26 10:32:31 +0200 |
| commit | 257578a333235fe04414699cbe9120598e12e363 (patch) | |
| tree | e5ed5d074107d1c60bb12c2f7064a4b30b30b736 /arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi | |
| parent | 847ab1285694b409fb9fe645fb9ad2856d973eac (diff) | |
arm: dts: colibri-imx6ull: clean-up sd card dts
Keep +3.3V pull-ups interface by default in imx6ull-colibri.dtsi
SD card interface setting per board device tree:
imx6ull-colibri-aster.dtsi +3.3V pull-ups
imx6ull-colibri-eval-v3.dtsi +3.3V pull-ups
imx6ull-colibri-iris.dtsi +3.3V pull-ups
imx6ull-colibri-iris-v2.dtsi +1.8V signaling, UHS capable
Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi index fa734dac574c..91702bb03dd1 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi @@ -33,14 +33,6 @@ pinctrl-0 = <&pinctrl_snvs_usbc_det>; }; - reg_3v3: regulator-3v3 { - compatible = "regulator-fixed"; - regulator-name = "3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - reg_5v0: regulator-5v0 { compatible = "regulator-fixed"; regulator-name = "5V"; @@ -139,36 +131,11 @@ 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 which is supported starting - * with hardware revision V1.1A. - */ -/* #define SD_1_8 */ &usdhc1 { -#ifdef SD_1_8 - pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>; - pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; - vqmmc-supply = <®_sd1_vqmmc>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; -#else - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; - pinctrl-1 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>; - no-1-8-v; -#endif - cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; - disable-wp; - enable-sdio-wakeup; cap-power-off-card; vmmc-supply = <®_3v3_vmmc>; + /delete-property/ keep-power-in-suspend; + /delete-property/ no-1-8-v; status = "okay"; }; |