diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-23 05:56:39 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-23 05:56:38 -0700 |
| commit | b52caad54d32bfa2280446e8f088fdcec4a0b0c2 (patch) | |
| tree | 3d4f5ef2f35e425ac394c01198982df67a1ac32c /drivers | |
| parent | 088c0f837e0ae080e708d7534276239de231825c (diff) | |
| parent | 9b2a6c3923959a00d7bb07552554392598c668be (diff) | |
Merge "smb-lib: add support for float charger reporting"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/supply/qcom/smb-lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/supply/qcom/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c index 22944f122c44..19be40bb4785 100644 --- a/drivers/power/supply/qcom/smb-lib.c +++ b/drivers/power/supply/qcom/smb-lib.c @@ -261,7 +261,7 @@ static const struct apsd_result const smblib_apsd_results[] = { [FLOAT] = { .name = "FLOAT", .bit = FLOAT_CHARGER_BIT, - .pst = POWER_SUPPLY_TYPE_USB_DCP + .pst = POWER_SUPPLY_TYPE_USB_FLOAT }, [HVDCP2] = { .name = "HVDCP2", @@ -3488,6 +3488,7 @@ static void smblib_force_legacy_icl(struct smb_charger *chg, int pst) vote(chg->usb_icl_votable, LEGACY_UNKNOWN_VOTER, true, 1500000); break; case POWER_SUPPLY_TYPE_USB_DCP: + case POWER_SUPPLY_TYPE_USB_FLOAT: vote(chg->usb_icl_votable, LEGACY_UNKNOWN_VOTER, true, 1500000); break; case POWER_SUPPLY_TYPE_USB_HVDCP: |