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

Merge "qcom: smb-lib: disable VCONN operations for micro USB mode"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-04 12:10:27 -07:00 • committed by Gerrit - the friendly Code Review server
commit ede6277d8b
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/power/supply/qcom/qpnp-smb2.c
View file

@ -1133,6 +1133,9 @@ static int smb2_init_vconn_regulator(struct smb2 *chip)
struct regulator_config cfg = {};
int rc = 0;
if (chg->micro_usb_mode)
return 0;
chg->vconn_vreg = devm_kzalloc(chg->dev, sizeof(*chg->vconn_vreg),
GFP_KERNEL);
if (!chg->vconn_vreg)
@ -1344,9 +1347,10 @@ static int smb2_disable_typec(struct smb_charger *chg)
int rc;
/* Move to typeC mode */
/* configure FSM in idle state */
/* configure FSM in idle state and disable UFP_ENABLE bit */
rc = smblib_masked_write(chg, TYPE_C_INTRPT_ENB_SOFTWARE_CTRL_REG,
TYPEC_DISABLE_CMD_BIT, TYPEC_DISABLE_CMD_BIT);
TYPEC_DISABLE_CMD_BIT | UFP_EN_CMD_BIT,
TYPEC_DISABLE_CMD_BIT);
if (rc < 0) {
dev_err(chg->dev, "Couldn't put FSM in idle rc=%d\n", rc);
return rc;
@ -2131,7 +2135,7 @@ static int smb2_probe(struct platform_device *pdev)
rc = smb2_init_vconn_regulator(chip);
if (rc < 0) {
pr_err("Couldn't initialize vconn regulator rc=%d\n",
rc);
rc);
goto cleanup;
}

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

@ -4117,6 +4117,9 @@ static void smblib_vconn_oc_work(struct work_struct *work)
int rc, i;
u8 stat;
if (chg->micro_usb_mode)
return;
smblib_err(chg, "over-current detected on VCONN\n");
if (!chg->vconn_vreg || !chg->vconn_vreg->rdev)
return;