diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-01-07 04:12:41 +0300 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-02-02 02:43:00 +0300 |
| commit | c7cc930f9a5c26385a08cd7dc28cb5e3ed186d72 (patch) | |
| tree | 14c7d2360d4f0d11bed99ecf41a18d2048f34cea | |
| parent | 9ef45106261e802f9d80bf0bc652124b42b1f344 (diff) | |
| download | kernel-crypto-c7cc930f9a5c26385a08cd7dc28cb5e3ed186d72.tar.gz kernel-crypto-c7cc930f9a5c26385a08cd7dc28cb5e3ed186d72.tar.xz kernel-crypto-c7cc930f9a5c26385a08cd7dc28cb5e3ed186d72.zip | |
power_supply: add few more values and props
Add LiMn (one of the most common for small non-rechargable batteries)
battery technology and voltage_min/_max properties support.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Anton Vorontsov <cbou@mail.ru>
| -rw-r--r-- | Documentation/power_supply_class.txt | 4 | ||||
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 5 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/power_supply_class.txt b/Documentation/power_supply_class.txt index a032c316b3b..a8686e5a685 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. diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index bab591ba785..d4824840c5b 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -48,7 +48,8 @@ static ssize_t power_supply_show_property(struct device *dev, "Unspecified failure" }; static char *technology_text[] = { - "Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd" + "Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd", + "LiMn" }; ssize_t ret; struct power_supply *psy = dev_get_drvdata(dev); @@ -84,6 +85,8 @@ static struct device_attribute power_supply_attrs[] = { POWER_SUPPLY_ATTR(present), POWER_SUPPLY_ATTR(online), POWER_SUPPLY_ATTR(technology), + POWER_SUPPLY_ATTR(voltage_max), + POWER_SUPPLY_ATTR(voltage_min), POWER_SUPPLY_ATTR(voltage_max_design), POWER_SUPPLY_ATTR(voltage_min_design), POWER_SUPPLY_ATTR(voltage_now), diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 358b38d09fe..5cbf3e37101 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -54,6 +54,7 @@ enum { POWER_SUPPLY_TECHNOLOGY_LIPO, POWER_SUPPLY_TECHNOLOGY_LiFe, POWER_SUPPLY_TECHNOLOGY_NiCd, + POWER_SUPPLY_TECHNOLOGY_LiMn, }; enum power_supply_property { @@ -63,6 +64,8 @@ enum power_supply_property { POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_TECHNOLOGY, + POWER_SUPPLY_PROP_VOLTAGE_MAX, + POWER_SUPPLY_PROP_VOLTAGE_MIN, POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, POWER_SUPPLY_PROP_VOLTAGE_NOW, |