summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-03-28 16:11:05 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-12-21 14:27:44 +0100
commitee1c27d7d124ba463ddb7ab1d0333dde85d7fbfa (patch)
treefa932ca2377813ec0f99bfbe61b59f141d593a57 /drivers
parent23de9e55818a92c7158c0a9e9a04c00c632d1ada (diff)
apalis-imx6: use stopmode for poweroff
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 051ee1a1c24058db62f10a177b1271daebbd2ebe)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/reset/imx-snvs-poweroff.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/power/reset/imx-snvs-poweroff.c b/drivers/power/reset/imx-snvs-poweroff.c
index 03447e08ffc4..525f8cb397a7 100644
--- a/drivers/power/reset/imx-snvs-poweroff.c
+++ b/drivers/power/reset/imx-snvs-poweroff.c
@@ -41,8 +41,16 @@ static int imx_poweroff_probe(struct platform_device *pdev)
return -ENODEV;
}
- if (!of_machine_is_compatible("toradex,colibri_imx6dl"))
+ /*
+ * The Apalis/Colibri iMX6 modules cannot use PMIC_ON_REQ to shutdown
+ * the PMIC or the module could only be restarted by power cycling
+ * if the SNVS is supplied by a backup battery.
+ * compare with pm-imx6.c, imx6_stop_mode_poweroff()
+ */
+ if (!of_machine_is_compatible("toradex,colibri_imx6dl") &&
+ !of_machine_is_compatible("toradex,apalis_imx6q"))
pm_power_off = do_imx_poweroff;
+
return 0;
}