diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-07-27 16:05:36 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-24 01:27:28 +0100 |
| commit | 2d082afba0b1f84d4ebcdf2cd2128c6e94c2ad58 (patch) | |
| tree | ac6fa94ce4c9433008e423cc7b409fb33cff20e8 /drivers/power | |
| parent | b00a39b22abcbbacf8412cc6b96dc5e1dd42ed39 (diff) | |
colibri-imx6: use stopmode for poweroff
After the system has been shutdown with PMIC_ON_REQ and VCC_BATT is supplied
from a battery it will never restart either by RESET or power cycle.
So use the PMIC_STBY_REQ after shutdown to switch off power rails.
Conflicts:
arch/arm/mach-imx/pm-imx6.c
drivers/regulator/pfuze100-regulator.c
(cherry-picked from commit c8b186404065c4502b485820ad4a51515924795c)
(cherry-picked from commit ee4c5c4da3b32f65528a2d523ca4bce574dee3c5)
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 29ff2389ecf7cb4e30924c80b8d42165cf306936)
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/reset/imx-snvs-poweroff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/reset/imx-snvs-poweroff.c b/drivers/power/reset/imx-snvs-poweroff.c index ad6ce5020ea7..03447e08ffc4 100644 --- a/drivers/power/reset/imx-snvs-poweroff.c +++ b/drivers/power/reset/imx-snvs-poweroff.c @@ -41,7 +41,8 @@ static int imx_poweroff_probe(struct platform_device *pdev) return -ENODEV; } - pm_power_off = do_imx_poweroff; + if (!of_machine_is_compatible("toradex,colibri_imx6dl")) + pm_power_off = do_imx_poweroff; return 0; } |