From d1f48b738aeb4aa109db85390e2bf8d7b01c11ed Mon Sep 17 00:00:00 2001 From: xuwt2 Date: Tue, 21 Aug 2018 15:20:10 +0800 Subject: [PATCH] power: adjust 27w charge policy, optimize charge performance -1,add force_pmic_chg judgement lable in order to avoid recovery paralle charge when the thermal zone was changed Change-Id: I2e1a9fe3ae564b6a58957c4e5eb5f640e234d737 Signed-off-by: xuwt2 Reviewed-on: https://gerrit.mot.com/1230716 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Yonghua Yan Reviewed-by: Jianqi Yang Submit-Approved: Jira Key --- drivers/power/mmi_pl_chg_manager/mmi_pl_chg_manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/power/mmi_pl_chg_manager/mmi_pl_chg_manager.c b/drivers/power/mmi_pl_chg_manager/mmi_pl_chg_manager.c index f3339c33cf7f..48deb96be003 100644 --- a/drivers/power/mmi_pl_chg_manager/mmi_pl_chg_manager.c +++ b/drivers/power/mmi_pl_chg_manager/mmi_pl_chg_manager.c @@ -979,7 +979,8 @@ static void mmi_pl_sm_work_func(struct work_struct *work) mmi_pl_pm_move_state(chip, PM_STATE_SW_ENTRY); } else if (chip->flashc_cc_max_curr_pre > chip->pmic_step_curr - && chip->pres_chrg_step < STEP_NORMAL) { + && chip->pres_chrg_step < STEP_NORMAL + && !chip->force_pmic_chg) { mmi_pl_dbg(chip, PR_MOTO, "battery volt %d , flashc max curr %d," "start flash charging\n", @@ -1700,6 +1701,7 @@ static void cancel_sm(struct mmi_pl_chg_manager *chip, int ms) chip->target_volt = 0; chip->pps_current_max = 0; chip->pps_voltage_max = 0; + chip->force_pmic_chg = false; memset(chip->mmi_pdo_info, 0, sizeof(struct usbpd_pdo_info) * PD_MAX_PDO_NUM); }