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

Merge "smb-lib: disable APSD run on CC while APSD is disabled"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-30 20:16:01 -08:00 • committed by Gerrit - the friendly Code Review server
commit 42e1251b38
1 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1053,13 +1053,41 @@ static int smblib_apsd_disable_vote_callback(struct votable *votable,
struct smb_charger *chg = data;
int rc;
rc = smblib_masked_write(chg, USBIN_OPTIONS_1_CFG_REG,
AUTO_SRC_DETECT_BIT,
apsd_disable ? 0 : AUTO_SRC_DETECT_BIT);
if (rc < 0) {
smblib_err(chg, "Couldn't %s APSD rc=%d\n",
apsd_disable ? "disable" : "enable", rc);
return rc;
if (apsd_disable) {
/* Don't run APSD on CC debounce when APSD is disabled */
rc = smblib_masked_write(chg, TYPE_C_CFG_REG,
APSD_START_ON_CC_BIT,
0);
if (rc < 0) {
smblib_err(chg, "Couldn't disable APSD_START_ON_CC rc=%d\n",
rc);
return rc;
}
rc = smblib_masked_write(chg, USBIN_OPTIONS_1_CFG_REG,
AUTO_SRC_DETECT_BIT,
0);
if (rc < 0) {
smblib_err(chg, "Couldn't disable APSD rc=%d\n", rc);
return rc;
}
} else {
rc = smblib_masked_write(chg, USBIN_OPTIONS_1_CFG_REG,
AUTO_SRC_DETECT_BIT,
AUTO_SRC_DETECT_BIT);
if (rc < 0) {
smblib_err(chg, "Couldn't enable APSD rc=%d\n", rc);
return rc;
}
rc = smblib_masked_write(chg, TYPE_C_CFG_REG,
APSD_START_ON_CC_BIT,
APSD_START_ON_CC_BIT);
if (rc < 0) {
smblib_err(chg, "Couldn't enable APSD_START_ON_CC rc=%d\n",
rc);
return rc;
}
}
return 0;