From a7c7f70bb5927afa6f049668394ca7e73bc7556f Mon Sep 17 00:00:00 2001 From: Qing Chang Date: Tue, 24 Mar 2020 12:18:22 -0500 Subject: [PATCH] power: reset: Use warm reset for dload mode dload mode requires memory contents to be maintained, so we have to use warm reset during reboot. Change-Id: Idb4a01685e7164cc6a5272d0287934bc6fe6307f Signed-off-by: Qing Chang Reviewed-on: https://gerrit.mot.com/1520641 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dong-Hua Yan Reviewed-by: Qing Chang Submit-Approved: Jira Key Reviewed-on: https://gerrit.mot.com/1778585 Reviewed-by: Huosheng Liao --- drivers/power/reset/msm-poweroff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 1003d705079b..d4cd4fa4c451 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -445,7 +445,7 @@ static void msm_restart_prepare(const char *cmd) pr_info("Forcing a warm reset of the system\n"); /* Hard reset the PMIC unless memory contents must be maintained. */ - if (force_warm_reboot || in_panic) + if (force_warm_reboot || need_warm_reset || in_panic) qpnp_pon_system_pwr_off(PON_POWER_OFF_WARM_RESET); else qpnp_pon_system_pwr_off(PON_POWER_OFF_HARD_RESET);