diff options
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx7-colibri-aster.dtsi | 3 | ||||
-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, 5 deletions
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 { diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 1db5aa5365b2..6d349413b193 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 = <®_3p3v>; vqmmc-supply = <®_LDO2>; #else pinctrl-names = "default"; @@ -317,6 +317,7 @@ enable-sdio-wakeup; keep-power-in-suspend; status = "okay"; + vmmc-supply = <®_3v3>; }; &iomuxc { diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 0d0a31e74784..9f3022b86041 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 = <®_LDO2>; -}; |