Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e1b65a3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: supply: qti_battery_charger: Add TIME_TO_FULL_NOW property"

parents c337ef15 18baafdb

drivers/power/supply/qti_battery_charger.c

+8 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,13 @@ static int battery_psy_get_prop(struct power_supply *psy, 


	pval->intval = -ENODATA;



	/*

	 * The prop id of TIME_TO_FULL_NOW and TIME_TO_FULL_AVG is same.

	 * So, map the prop id of TIME_TO_FULL_AVG for TIME_TO_FULL_NOW.

	 */

	if (prop == POWER_SUPPLY_PROP_TIME_TO_FULL_NOW)

		prop = POWER_SUPPLY_PROP_TIME_TO_FULL_AVG;



	prop_id = get_property_id(pst, prop);

	if (prop_id < 0)

		return prop_id;
@@ -1100,6 +1107,7 @@ static enum power_supply_property battery_props[] = { 
	POWER_SUPPLY_PROP_CHARGE_FULL,

	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,

	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,

	POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,

	POWER_SUPPLY_PROP_POWER_NOW,

	POWER_SUPPLY_PROP_POWER_AVG,