Merge "qpnp-fg-gen3: notify charger with float voltage and FCC"

This commit is contained in:
Linux Build Service Account 2016-10-20 03:33:11 -07:00 committed by Gerrit - the friendly Code Review server
commit d3ac4bf6d2

View file

@ -1644,6 +1644,37 @@ out:
return rc;
}
static void fg_notify_charger(struct fg_chip *chip)
{
union power_supply_propval prop = {0, };
int rc;
if (!is_charger_available(chip)) {
pr_warn("Charger not available yet?\n");
return;
}
prop.intval = chip->bp.float_volt_uv;
rc = power_supply_set_property(chip->batt_psy,
POWER_SUPPLY_PROP_VOLTAGE_MAX, &prop);
if (rc < 0) {
pr_err("Error in setting voltage_max property on batt_psy, rc=%d\n",
rc);
return;
}
prop.intval = chip->bp.fastchg_curr_ma;
rc = power_supply_set_property(chip->batt_psy,
POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &prop);
if (rc < 0) {
pr_err("Error in setting constant_charge_current_max property on batt_psy, rc=%d\n",
rc);
return;
}
fg_dbg(chip, FG_STATUS, "Notified charger on float voltage and FCC\n");
}
static void profile_load_work(struct work_struct *work)
{
struct fg_chip *chip = container_of(work,
@ -1709,6 +1740,7 @@ done:
rc);
}
fg_notify_charger(chip);
chip->profile_loaded = true;
fg_dbg(chip, FG_STATUS, "profile loaded successfully");
out:
@ -1798,6 +1830,7 @@ static int fg_psy_get_property(struct power_supply *psy,
break;
case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
pval->intval = chip->bp.float_volt_uv;
break;
case POWER_SUPPLY_PROP_CYCLE_COUNT:
pval->intval = fg_get_cycle_count(chip);
break;