diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-26 22:23:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-26 22:23:00 -0700 |
| commit | 78cf186b801dead9fa668701e820d21ea6876c3a (patch) | |
| tree | 1c9864c298033ae9de5f571fabfb710d4c6b506e | |
| parent | 97cb0bb99f1303af080a183684afca368ae74eee (diff) | |
| parent | 79c88a3bdbe49e067b3334e12afb2a64ea5fb16b (diff) | |
Merge "qpnp-fg-gen3: export the battery float voltage"
| -rw-r--r-- | drivers/power/qcom-charger/qpnp-fg-gen3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/qcom-charger/qpnp-fg-gen3.c b/drivers/power/qcom-charger/qpnp-fg-gen3.c index 29b9519bd541..dda94bb3f932 100644 --- a/drivers/power/qcom-charger/qpnp-fg-gen3.c +++ b/drivers/power/qcom-charger/qpnp-fg-gen3.c @@ -833,6 +833,9 @@ static int fg_psy_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_BATTERY_TYPE: pval->strval = fg_get_battery_type(chip); break; + case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN: + pval->intval = chip->bp.float_volt_uv; + break; default: break; } @@ -894,6 +897,7 @@ static enum power_supply_property fg_psy_props[] = { POWER_SUPPLY_PROP_RESISTANCE, POWER_SUPPLY_PROP_BATTERY_TYPE, POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, + POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, }; static const struct power_supply_desc fg_psy_desc = { |