summaryrefslogtreecommitdiff
path: root/drivers/power/reset
diff options
context:
space:
mode:
authorLijuan Gao <lijuang@codeaurora.org>2016-01-07 13:59:53 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-18 00:11:45 -0700
commitcb761170c7dd3817ec70437eed70f6ddc06df11e (patch)
tree807d3ff3a22862f119b7cc2281595951dd491429 /drivers/power/reset
parent008f057bbab6dd6629b7e1a3b8c67b650a6b9ef1 (diff)
drivers: power: reset: Do warm reset when device reboot to edl
Device reboot to edl, it's for switching device to emergency dload mode. So it's need to keep device to do warm reset. Change-Id: I8f5d0845c6f2d37ea740949ce56e02c4cc7412be Signed-off-by: Lijuan Gao <lijuang@codeaurora.org>
Diffstat (limited to 'drivers/power/reset')
-rw-r--r--drivers/power/reset/msm-poweroff.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c
index 170afbb5fdf6..75a0de0c532b 100644
--- a/drivers/power/reset/msm-poweroff.c
+++ b/drivers/power/reset/msm-poweroff.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -230,7 +230,9 @@ static void msm_restart_prepare(const char *cmd)
if (qpnp_pon_check_hard_reset_stored()) {
/* Set warm reset as true when device is in dload mode */
- if (get_dload_mode())
+ if (get_dload_mode() ||
+ ((cmd != NULL && cmd[0] != '\0') &&
+ !strcmp(cmd, "edl")))
need_warm_reset = true;
} else {
need_warm_reset = (get_dload_mode() ||