Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bf542a4e7b634c2adcba4241a29082f69b0f45dc

Authored by Sascha Silbe
Committed by Anton Vorontsov
1 parent 22fadd766b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

olpc_battery: Fix up XO-1.5 properties list 

The patches adding support for CURRENT_NOW, VOLTAGE_NOW, CHARGE_NOW and
CHARGE_FULL_DESIGN were based on a tree not including c566d299
("olpc_battery: Ambient temperature is not available on XO-1.5") and
therefore only modified the then-common, now-XO-1 properties list. This
patch adds the new properties to XO-1.5 as well.

Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

drivers/power/olpc_battery.c
Diff comments   View file @ bf542a4
... ... @@ -438,9 +438,13 @@
438 438 POWER_SUPPLY_PROP_HEALTH,
439 439 POWER_SUPPLY_PROP_TECHNOLOGY,
440 440 POWER_SUPPLY_PROP_VOLTAGE_AVG,
  441 + POWER_SUPPLY_PROP_VOLTAGE_NOW,
441 442 POWER_SUPPLY_PROP_CURRENT_AVG,
  443 + POWER_SUPPLY_PROP_CURRENT_NOW,
442 444 POWER_SUPPLY_PROP_CAPACITY,
443 445 POWER_SUPPLY_PROP_CAPACITY_LEVEL,
  446 + POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
  447 + POWER_SUPPLY_PROP_CHARGE_NOW,
444 448 POWER_SUPPLY_PROP_TEMP,
445 449 POWER_SUPPLY_PROP_MANUFACTURER,
446 450 POWER_SUPPLY_PROP_SERIAL_NUMBER,