diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-07-06 11:45:50 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2017-07-10 09:30:57 +0200 |
| commit | 0284f779bba00b930bd9bb12703e2092478531c7 (patch) | |
| tree | ee3a61f2e27cfa105779cd4f27ea891a7b070f45 | |
| parent | 38524d73583e8f7fc61c8acd57b77c0a29889616 (diff) | |
Revert "imx7-colibri-aster/eval-v3: fix vmmc-supply"
This reverts commit 82f0f4f012a646a735d6b44de77b7c9d0712c714.
This is only an issue for later Colibri iMX7S 256MB V1.1C and Colibri
iMX7D 512MB V1.1D modules which are currently still in Toradex internal
validation & verification.
As it turns out not using LDO2 anywhere at all in the regular case is a
bad idea leading to the following:
[ 2.317688] LDO2: disabling
Of course display and SD card still worked on the EvalBoard due to back
feeding through some pull-ups however on Viola with just one pull-up
it failed once both display and SD card were active...
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri-aster.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi index 152cb3db1ea5..d99208746b70 100644 --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi @@ -249,6 +249,7 @@ pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_cd_usdhc1>; pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_cd_usdhc1>; + vmmc-supply = <®_3p3v>; vqmmc-supply = <®_LDO2>; #else pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index b46fea022d06..1db5aa5365b2 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 Toradex AG + * Copyright 2016 Toradex AG * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -305,6 +305,7 @@ pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_cd_usdhc1>; pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_cd_usdhc1>; + vmmc-supply = <®_3p3v>; vqmmc-supply = <®_LDO2>; #else pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index dddc15bf7392..0d0a31e74784 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -1,6 +1,6 @@ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. - * Copyright (C) 2016-2017 Toradex AG + * Copyright (C) 2016 Toradex AG * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -754,5 +754,5 @@ }; &usdhc1 { - vmmc-supply = <®_module_3v3>; + vmmc-supply = <®_LDO2>; }; |