From 0284f779bba00b930bd9bb12703e2092478531c7 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 6 Jul 2017 11:45:50 +0200 Subject: 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 Acked-by: Max Krummenacher --- arch/arm/boot/dts/imx7-colibri-aster.dtsi | 1 + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 3 ++- arch/arm/boot/dts/imx7-colibri.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'arch/arm/boot/dts') 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>; }; -- cgit v1.2.3