summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-07-06 15:37:17 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2017-07-10 09:32:26 +0200
commitac8dcd0d7b7d17ad8ac42b42cb1f51d4417f4950 (patch)
tree2e6d5d74756fd3b14c119e3807c00264f67259a9
parent0284f779bba00b930bd9bb12703e2092478531c7 (diff)
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 <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--arch/arm/boot/dts/imx7-colibri-aster.dtsi3
-rw-r--r--arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi3
-rw-r--r--arch/arm/boot/dts/imx7-colibri.dtsi4
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
index d992087..9d55d9f 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 = <&reg_3p3v>;
vqmmc-supply = <&reg_LDO2>;
#else
pinctrl-names = "default";
@@ -261,6 +261,7 @@
enable-sdio-wakeup;
keep-power-in-suspend;
status = "okay";
+ vmmc-supply = <&reg_3v3>;
};
&iomuxc {
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 1db5aa5..6d34941 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -50,6 +50,7 @@
regulator-name = "3.3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
+ regulator-always-on;
};
reg_5v0: regulator-5v0 {
@@ -305,7 +306,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 = <&reg_3p3v>;
vqmmc-supply = <&reg_LDO2>;
#else
pinctrl-names = "default";
@@ -317,6 +317,7 @@
enable-sdio-wakeup;
keep-power-in-suspend;
status = "okay";
+ vmmc-supply = <&reg_3v3>;
};
&iomuxc {
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 0d0a31e..9f3022b 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -212,6 +212,7 @@
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
+ regulator-always-on;
};
reg_LDO3: LDO3 { /* PWR_EN_+V3.3_LPSR */
@@ -753,6 +754,3 @@
dr_mode = "otg";
};
-&usdhc1 {
- vmmc-supply = <&reg_LDO2>;
-};