summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 10:55:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 10:55:07 -0700
commitb14f7fb5aa2f4289e3a9fa8d7d92417ec8607498 (patch)
tree8f0ef2cf36dbf096e91c89f5917a24fb363f6101 /Documentation
parent00e9028a95fb8a4d79f2fb695a853f33ea7d3b57 (diff)
parent9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (diff)
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply: Sharp SL-6000 (tosa) batteries support power_supply: fix up CHARGE_COUNTER output to be more precise power_supply: add CHARGE_COUNTER property and olpc_battery support for it power_supply: bump EC version check that we refuse to run with in olpc_battery power_supply: cleanup of the OLPC battery driver power_supply: add eeprom dump file to olpc_battery's sysfs power_supply: Support serial number in olpc_battery
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/power/power_supply_class.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/power/power_supply_class.txt b/Documentation/power/power_supply_class.txt
index a8686e5a6857..c6cd4956047c 100644
--- a/Documentation/power/power_supply_class.txt
+++ b/Documentation/power/power_supply_class.txt
@@ -101,6 +101,10 @@ of charge when battery became full/empty". It also could mean "value of
charge when battery considered full/empty at given conditions (temperature,
age)". I.e. these attributes represents real thresholds, not design values.
+CHARGE_COUNTER - the current charge counter (in µAh). This could easily
+be negative; there is no empty or full value. It is only useful for
+relative, time-based measurements.
+
ENERGY_FULL, ENERGY_EMPTY - same as above but for energy.
CAPACITY - capacity in percents.