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

Merge "qcom-charger: smblib: add support for pd current setting"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-11 20:05:45 -08:00 • committed by Gerrit - the friendly Code Review server
commit b240a83d88
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/power/qcom-charger/smb-lib.c
View file

@ -2014,6 +2014,45 @@ int smblib_set_prop_pd_active(struct smb_charger *chg,
"Couldn't enable vconn on CC line rc=%d\n", rc);
return rc;
}
rc = vote(chg->usb_icl_votable, PD_VOTER, true, USBIN_500MA);
if (rc < 0) {
smblib_err(chg, "Couldn't vote for USB ICL rc=%d\n",
rc);
return rc;
}
rc = smblib_masked_write(chg, USBIN_ICL_OPTIONS_REG,
USBIN_MODE_CHG_BIT, USBIN_MODE_CHG_BIT);
if (rc < 0) {
smblib_err(chg,
"Couldn't change USB mode rc=%d\n", rc);
return rc;
}
rc = smblib_masked_write(chg, CMD_APSD_REG,
ICL_OVERRIDE_BIT, ICL_OVERRIDE_BIT);
if (rc < 0) {
smblib_err(chg,
"Couldn't override APSD rc=%d\n", rc);
return rc;
}
} else {
rc = smblib_masked_write(chg, CMD_APSD_REG,
ICL_OVERRIDE_BIT, 0);
if (rc < 0) {
smblib_err(chg,
"Couldn't override APSD rc=%d\n", rc);
return rc;
}
rc = smblib_masked_write(chg, USBIN_ICL_OPTIONS_REG,
USBIN_MODE_CHG_BIT, 0);
if (rc < 0) {
smblib_err(chg,
"Couldn't change USB mode rc=%d\n", rc);
return rc;
}
}
/* CC pin selection s/w override in PD session; h/w otherwise. */