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

Merge "qcom: smb138x: supsend USBIN and disable OTG before shutdown"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-21 12:16:29 -07:00 • committed by Gerrit - the friendly Code Review server
commit da4c2cf3b3
1 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/power/supply/qcom/smb138x-charger.c
View file

@ -863,6 +863,13 @@ static int smb138x_init_slave_hw(struct smb138x *chip)
return rc; return rc;
} }
/* Disable OTG */
rc = smblib_masked_write(chg, CMD_OTG_REG, OTG_EN_BIT, 0);
if (rc < 0) {
pr_err("Couldn't disable OTG rc=%d\n", rc);
return rc;
}
/* suspend parallel charging */ /* suspend parallel charging */
rc = smb138x_set_parallel_suspend(chip, true); rc = smb138x_set_parallel_suspend(chip, true);
if (rc < 0) { if (rc < 0) {
@ -960,6 +967,20 @@ static int smb138x_init_hw(struct smb138x *chip)
chg->dcp_icl_ua = chip->dt.usb_icl_ua; chg->dcp_icl_ua = chip->dt.usb_icl_ua;
/* Disable OTG */
rc = smblib_masked_write(chg, CMD_OTG_REG, OTG_EN_BIT, 0);
if (rc < 0) {
pr_err("Couldn't disable OTG rc=%d\n", rc);
return rc;
}
/* Unsuspend USB input */
rc = smblib_masked_write(chg, USBIN_CMD_IL_REG, USBIN_SUSPEND_BIT, 0);
if (rc < 0) {
pr_err("Couldn't unsuspend USB, rc=%d\n", rc);
return rc;
}
/* configure to a fixed 700khz freq to avoid tdie errors */ /* configure to a fixed 700khz freq to avoid tdie errors */
rc = smblib_set_charge_param(chg, &chg->param.freq_buck, 700); rc = smblib_set_charge_param(chg, &chg->param.freq_buck, 700);
if (rc < 0) { if (rc < 0) {
@ -1600,14 +1621,33 @@ static int smb138x_remove(struct platform_device *pdev)
return 0; return 0;
} }
static void smb138x_shutdown(struct platform_device *pdev)
{
struct smb138x *chip = platform_get_drvdata(pdev);
struct smb_charger *chg = &chip->chg;
int rc;
/* Suspend charging */
rc = smb138x_set_parallel_suspend(chip, true);
if (rc < 0)
pr_err("Couldn't suspend charging rc=%d\n", rc);
/* Disable OTG */
rc = smblib_masked_write(chg, CMD_OTG_REG, OTG_EN_BIT, 0);
if (rc < 0)
pr_err("Couldn't disable OTG rc=%d\n", rc);
}
static struct platform_driver smb138x_driver = { static struct platform_driver smb138x_driver = {
.driver = { .driver = {
.name = "qcom,smb138x-charger", .name = "qcom,smb138x-charger",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = match_table, .of_match_table = match_table,
}, },
.probe = smb138x_probe, .probe = smb138x_probe,
.remove = smb138x_remove, .remove = smb138x_remove,
.shutdown = smb138x_shutdown,
}; };
module_platform_driver(smb138x_driver); module_platform_driver(smb138x_driver);