evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qcom: smb-lib: rerun APSD on insertion for micro USB mode"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-16 21:49:19 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0293b8a7d0
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/power/supply/qcom/smb-lib.c
View file

@ -685,6 +685,7 @@ static void smblib_uusb_removal(struct smb_charger *chg)
chg->voltage_max_uv = MICRO_5V; chg->voltage_max_uv = MICRO_5V;
chg->usb_icl_delta_ua = 0; chg->usb_icl_delta_ua = 0;
chg->pulse_cnt = 0; chg->pulse_cnt = 0;
chg->uusb_apsd_rerun_done = false;
/* clear USB ICL vote for USB_PSY_VOTER */ /* clear USB ICL vote for USB_PSY_VOTER */
rc = vote(chg->usb_icl_votable, USB_PSY_VOTER, false, 0); rc = vote(chg->usb_icl_votable, USB_PSY_VOTER, false, 0);
@ -752,6 +753,7 @@ int smblib_rerun_apsd_if_required(struct smb_charger *chg)
rc); rc);
} }
chg->uusb_apsd_rerun_done = true;
smblib_rerun_apsd(chg); smblib_rerun_apsd(chg);
return 0; return 0;
@ -3482,6 +3484,17 @@ irqreturn_t smblib_handle_usb_source_change(int irq, void *data)
} }
smblib_dbg(chg, PR_REGISTER, "APSD_STATUS = 0x%02x\n", stat); smblib_dbg(chg, PR_REGISTER, "APSD_STATUS = 0x%02x\n", stat);
if (chg->micro_usb_mode && (stat & APSD_DTC_STATUS_DONE_BIT)
&& !chg->uusb_apsd_rerun_done) {
/*
* Force re-run APSD to handle slow insertion related
* charger-mis-detection.
*/
chg->uusb_apsd_rerun_done = true;
smblib_rerun_apsd(chg);
return IRQ_HANDLED;
}
smblib_handle_apsd_done(chg, smblib_handle_apsd_done(chg,
(bool)(stat & APSD_DTC_STATUS_DONE_BIT)); (bool)(stat & APSD_DTC_STATUS_DONE_BIT));

1
drivers/power/supply/qcom/smb-lib.h
View file

@ -312,6 +312,7 @@ struct smb_charger {
int vconn_attempts; int vconn_attempts;
int default_icl_ua; int default_icl_ua;
int otg_cl_ua; int otg_cl_ua;
bool uusb_apsd_rerun_done;
/* workaround flag */ /* workaround flag */
u32 wa_flags; u32 wa_flags;