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

Commit 22fadd76 authored by Sascha Silbe's avatar Sascha Silbe Committed by Anton Vorontsov
Browse files

olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW 



{CURRENT,VOLTAGE}_AVG are actually {CURRENT,VOLTAGE}_NOW (the EC code
directly passes through the value from the gas gauge instead of the
internally used average). We retain {CURRENT,VOLTAGE}_AVG as an alias
for compatibility reasons, it will be removed later.

Signed-off-by: default avatarSascha Silbe <sascha-pgp@silbe.org>
[ pgf@laptop.org: added VOLTAGE_NOW, aliased to VOLTAGE_AVG ]
Signed-off-by: default avatarPaul Fox <pgf@laptop.org>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent 20fd9830

drivers/power/olpc_battery.c

+4 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ static int olpc_bat_get_property(struct power_supply *psy, 
			return ret;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_AVG:

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		ret = olpc_ec_cmd(EC_BAT_VOLTAGE, NULL, 0, (void *)&ec_word, 2);

		if (ret)

			return ret;
@@ -340,6 +341,7 @@ static int olpc_bat_get_property(struct power_supply *psy, 
		val->intval = (s16)be16_to_cpu(ec_word) * 9760L / 32;

		break;

	case POWER_SUPPLY_PROP_CURRENT_AVG:

	case POWER_SUPPLY_PROP_CURRENT_NOW:

		ret = olpc_ec_cmd(EC_BAT_CURRENT, NULL, 0, (void *)&ec_word, 2);

		if (ret)

			return ret;
@@ -414,7 +416,9 @@ static enum power_supply_property olpc_xo1_bat_props[] = { 
	POWER_SUPPLY_PROP_HEALTH,

	POWER_SUPPLY_PROP_TECHNOLOGY,

	POWER_SUPPLY_PROP_VOLTAGE_AVG,

	POWER_SUPPLY_PROP_VOLTAGE_NOW,

	POWER_SUPPLY_PROP_CURRENT_AVG,

	POWER_SUPPLY_PROP_CURRENT_NOW,

	POWER_SUPPLY_PROP_CAPACITY,

	POWER_SUPPLY_PROP_CAPACITY_LEVEL,

	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,