From ac8dcd0d7b7d17ad8ac42b42cb1f51d4417f4950 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 6 Jul 2017 15:37:17 +0200 Subject: colibri_imx7: fix ldo2 operation without sd card 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. Currently without an SD card inserted the regulator framework actually powers the LDO2 off however e.g. the BL_ON pin is also on that same rail! Fix this by specifying LDO2 to be always on and use the regular 3.3V supply from the carrier board as the vmmc-supply. Specify that carrier board 3.3V supply to be always on as well to avoid the following misleading message during boot: [ 2.299654] 3.3V: disabling One remaining issue is that now in suspend LDO2 is still powered and even adding the following did not help: regulator-state-mem { regulator-off-in-suspend; }; Further investigation pending. Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher --- arch/arm/boot/dts/imx7-colibri-aster.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/imx7-colibri-aster.dtsi') diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi index d99208746b70..9d55d9fa4492 100644 --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi @@ -39,6 +39,7 @@ regulator-name = "3.3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; reg_5v0: regulator-5v0 { @@ -249,7 +250,6 @@ 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"; @@ -261,6 +261,7 @@ enable-sdio-wakeup; keep-power-in-suspend; status = "okay"; + vmmc-supply = <®_3v3>; }; &iomuxc { -- cgit v1.2.3