A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "(CR): charging: fixed multiple rerun apsd"

Browse source 
Moved rerun APSD for SDP/OCP/Float to smb5-lib.c

CRs-fixed:(CR)

This reverts commit a0c71ac3b034f0cbb6a600047851455da65b9b1f.
Change-Id: Ie312ace3d33bbf384abea29c51de6949888d894d
Reviewed-on: https://gerrit.mot.com/1445263
SME-Granted: SME Approvals Granted
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
This commit is contained in:
Haijian Ma 2019-10-28 15:53:59 +08:00
commit 6b50e2ea72
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c
View file

@ -1862,21 +1862,21 @@ static void mmi_charger_check_work(struct work_struct *work)
{
int rc;
int apsd;
int usb_icl;
struct smb_mmi_charger *chg = container_of(work,
struct smb_mmi_charger,
charger_check_work.work);
if (chg->factory_mode)
return;
rc = smblib_get_apsd_result(chg, &apsd);
if (rc < 0 || apsd == CHG_BC1P2_UNKNOWN)
return;
if (apsd == CHG_BC1P2_FLOAT ||
usb_icl = get_effective_result(chg->usb_icl_votable);
if (usb_icl <= USBIN_100MA ||
apsd == CHG_BC1P2_FLOAT ||
apsd == CHG_BC1P2_OCP) {
smblib_rerun_apsd(chg);
mmi_info(chg, "SMBMMI: Rerun APSD, apsd=%d\n", apsd);
mmi_info(chg, "SMBMMI: Rerun APSD, apsd=%d, icl=%d\n", apsd, usb_icl);
}
}
@ -2851,7 +2851,7 @@ static void mmi_heartbeat_work(struct work_struct *work)
struct smb_mmi_chg_status chg_stat;
int apsd;
static int rerun_apsd_count = 0;
static int prev_apsd = CHG_BC1P2_UNKNOWN;
/* Have not been resumed so wait another 100 ms */
if (chip->suspended & IS_SUSPENDED) {
@ -2941,24 +2941,21 @@ static void mmi_heartbeat_work(struct work_struct *work)
} else
chg_stat.charger_present = pval.intval & chg_stat.vbus_present;
if (!rerun_apsd_count && chg_stat.charger_present) {
rc = smblib_get_apsd_result(chip, &apsd);
if (rc < 0) {
mmi_warn(chip, "Error getting apsd result rc = %d\n", rc);
apsd = prev_apsd;
rc = smblib_get_apsd_result(chip, &apsd);
if (rc < 0) {
mmi_warn(chip, "Error getting apsd result rc = %d\n", rc);
if (!chg_stat.charger_present)
apsd = CHG_BC1P2_UNKNOWN;
}
}
if (apsd != prev_apsd) {
mmi_info(chip, "Update apsd (%d)-> (%d)\n", prev_apsd, apsd);
prev_apsd = apsd;
cancel_delayed_work(&chip->charger_check_work);
if (apsd != CHG_BC1P2_UNKNOWN) {
rerun_apsd_count ++;
cancel_delayed_work(&chip->charger_check_work);
schedule_delayed_work(&chip->charger_check_work,
msecs_to_jiffies(CHARGER_CHECK_DELAY_MS));
mmi_info(chip, "APSD = %d, rerun_apsd_count = %d\n",
apsd, rerun_apsd_count);
}
} else if (rerun_apsd_count) {
rerun_apsd_count = 0;
cancel_delayed_work(&chip->charger_check_work);
}
mmi_chrg_rate_check(chip);