diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-02 15:13:05 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-02 15:13:05 +1100 |
| commit | ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e (patch) | |
| tree | 98c162c79113bc2bd748a3ad5b6fb5ba66139751 /Documentation | |
| parent | 63e9b66e29357dd12e8b1d3ebf7036e7591f81e3 (diff) | |
| parent | e91926e9ea9073d8ce95b74602e8c2d775f5a793 (diff) | |
| download | talos-obmc-linux-ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e.tar.gz talos-obmc-linux-ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e.zip | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
apm_power: check I.intval for zero value, we use it as the divisor
MAINTAINERS: remove kernel-discuss@handhelds.org list
pda_power: implement polling
pda_power: various cleanups
apm_power: support using VOLTAGE_* properties for apm calculations
pda_power: add suspend/resume support
power_supply: add few more values and props
pda_power: only register available psu
power: fix incorrect unregistration in power_supply_create_attrs error path
power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL
[BATTERY] power_supply_leds: use kasprintf
[BATTERY] Every file should include the headers containing the prototypes for its global functions.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/power_supply_class.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/power_supply_class.txt b/Documentation/power_supply_class.txt index 9758cf433c06..a8686e5a6857 100644 --- a/Documentation/power_supply_class.txt +++ b/Documentation/power_supply_class.txt @@ -87,6 +87,10 @@ batteries use voltage for very approximated calculation of capacity. Battery driver also can use this attribute just to inform userspace about maximal and minimal voltage thresholds of a given battery. +VOLTAGE_MAX, VOLTAGE_MIN - same as _DESIGN voltage values except that +these ones should be used if hardware could only guess (measure and +retain) the thresholds of a given power supply. + CHARGE_FULL_DESIGN, CHARGE_EMPTY_DESIGN - design charge values, when battery considered full/empty. @@ -100,8 +104,6 @@ age)". I.e. these attributes represents real thresholds, not design values. ENERGY_FULL, ENERGY_EMPTY - same as above but for energy. CAPACITY - capacity in percents. -CAPACITY_LEVEL - capacity level. This corresponds to -POWER_SUPPLY_CAPACITY_LEVEL_*. TEMP - temperature of the power supply. TEMP_AMBIENT - ambient temperature. |
