diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-13 23:13:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-13 23:13:06 -0700 |
| commit | f4b1836237d93e58cdb055d220b1692e9be69056 (patch) | |
| tree | 7ddb80828442157f9acee92abb3d4d8bd1c05ec0 | |
| parent | 9d8e34f721a4a349fb3c55976afb3c2f6ab48c98 (diff) | |
| parent | 291f50a4a73fb6279cc1f42d06ba04b97575f1b6 (diff) | |
Merge "qcom-charger: smblib: update ICL votings in parallel charging"
| -rw-r--r-- | drivers/power/qcom-charger/smb-lib.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/power/qcom-charger/smb-lib.c b/drivers/power/qcom-charger/smb-lib.c index 8fe882e078f0..8c7cd6e0cdd2 100644 --- a/drivers/power/qcom-charger/smb-lib.c +++ b/drivers/power/qcom-charger/smb-lib.c @@ -1677,9 +1677,12 @@ static void smblib_handle_typec_debounce_done(struct smb_charger *chg, vote(chg->pl_disable_votable, TYPEC_SRC_VOTER, !rising || sink_attached, 0); - /* reset taper_end voter here */ - if (!rising || sink_attached) + if (!rising || sink_attached) { + /* icl votes to disable parallel charging */ + vote(chg->pl_disable_votable, USBIN_ICL_VOTER, true, 0); + /* reset taper_end voter here */ vote(chg->pl_disable_votable, TAPER_END_VOTER, false, 0); + } smblib_dbg(chg, PR_INTERRUPT, "IRQ: debounce-done %s; Type-C %s detected\n", rising ? "rising" : "falling", |