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-07 12:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

smb5: rerun apsd right after the first time apsd done

Browse source 
Sometimes, a charger may be detected as SDP after apsd for the first
it plugins, add rerun APSD to reduce the APSD failure for the first
time.
Set the initial USB ICL to 500mA in case USB controller never complete
enumeration to set the target ICL.

Change-Id: I60aedd478fe890f1c40a202e3b0df4e64658cMontana
Signed-off-by: yanyh2 <yanyh2@motorola.com>
Reviewed-on: https://gerrit.mot.com/1420421
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Haijian Ma <mahj8@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1502930
Reviewed-on: https://gerrit.mot.com/1770982
This commit is contained in:
yanyh2 2019-09-12 16:08:03 +08:00 • committed by Xiaojun Ji
commit aa30dcf596
2 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

47
drivers/power/supply/qcom/smb5-lib.c
View file

@ -4492,8 +4492,11 @@ static int smblib_handle_usb_current(struct smb_charger *chg,
return 0;
typec_mode = smblib_get_prop_typec_mode(chg);
if (typec_rp_med_high(chg, typec_mode))
if (typec_rp_med_high(chg, typec_mode)) {
vote(chg->usb_icl_votable, USB_PSY_VOTER,
false, 0);
return 0;
}
/* if flash is active force 500mA */
if ((usb_current < SDP_CURRENT_UA) && is_flash_active(chg))
@ -5935,40 +5938,29 @@ static void update_sw_icl_max(struct smb_charger *chg, int val)
if (typec_rp_med_high(chg, typec_mode)) {
rp_ua = get_rp_based_dcp_current(chg, typec_mode);
vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, true, rp_ua);
vote(chg->usb_icl_votable, USB_PSY_VOTER, false, 0);
return;
}
/* rp-std or legacy, USB BC 1.2 */
switch (val) {
case POWER_SUPPLY_TYPE_USB:
/*
* USB_PSY will vote to increase the current to 500/900mA once
* enumeration is done.
*/
if (!is_client_vote_enabled(chg->usb_icl_votable,
USB_PSY_VOTER)) {
/* if flash is active force 500mA */
vote(chg->usb_icl_votable, USB_PSY_VOTER, true,
is_flash_active(chg) ?
SDP_CURRENT_UA : SDP_100_MA);
}
vote(chg->usb_icl_votable, USB_PSY_VOTER, true, SDP_CURRENT_UA);
vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, false, 0);
break;
case POWER_SUPPLY_TYPE_USB_CDP:
vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, true,
CDP_CURRENT_UA);
vote(chg->usb_icl_votable, USB_PSY_VOTER, false, 0);
break;
case POWER_SUPPLY_TYPE_USB_DCP:
rp_ua = get_rp_based_dcp_current(chg, typec_mode);
vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, true, rp_ua);
vote(chg->usb_icl_votable, USB_PSY_VOTER, false, 0);
break;
case QTI_POWER_SUPPLY_TYPE_USB_FLOAT:
/*
* limit ICL to 100mA, the USB driver will enumerate to check
* if this is a SDP and appropriately set the current
*/
vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, true,
SDP_100_MA);
SDP_CURRENT_UA);
break;
case POWER_SUPPLY_TYPE_UNKNOWN:
default:
@ -6040,6 +6032,26 @@ irqreturn_t smb5_usb_source_change_irq_handler(int irq, void *data)
return IRQ_HANDLED;
}
if ((chg->connector_type == QTI_POWER_SUPPLY_CONNECTOR_TYPEC)
&& (stat & APSD_DTC_STATUS_DONE_BIT)
&& !chg->typec_apsd_rerun_done) {
const struct apsd_result *apsd_result =
smblib_update_usb_type(chg);
/*
* Force re-run APSD to handle slow insertion related
* charger-mis-detection.
*/
if (apsd_result->bit == SDP_CHARGER_BIT ||
apsd_result->bit == OCP_CHARGER_BIT ||
apsd_result->bit == FLOAT_CHARGER_BIT) {
smblib_dbg(chg, PR_INTERRUPT, "IRQ: rerun apsd for %s\n",
apsd_result->name);
chg->typec_apsd_rerun_done = true;
smblib_rerun_apsd_if_required(chg);
return IRQ_HANDLED;
}
}
smblib_handle_apsd_done(chg,
(bool)(stat & APSD_DTC_STATUS_DONE_BIT));
@ -6462,6 +6474,7 @@ static void typec_src_removal(struct smb_charger *chg)
chg->usbin_forced_max_uv = 0;
chg->chg_param.forced_main_fcc = 0;
chg->pd_contract_uv = 0;
chg->typec_apsd_rerun_done = false;
/* Reset all CC mode votes */
vote(chg->fcc_main_votable, MAIN_FCC_VOTER, false, 0);

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

@ -533,6 +533,7 @@ struct smb_charger {
int default_icl_ua;
int otg_cl_ua;
bool uusb_apsd_rerun_done;
bool typec_apsd_rerun_done;
bool typec_present;
int fake_input_current_limited;
int typec_mode;