diff options
| author | Heikki Krogerus <ext-heikki.krogerus@nokia.com> | 2010-10-04 03:51:38 -0400 | 
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-10-06 09:37:22 -0400 | 
| commit | fe3f6d097a042cff54bc1dc06f21ef528affe8ca (patch) | |
| tree | c92c3ad496bf1e2779067142cd438d4182fecd90 | |
| parent | 85efc8a18cedf70e55acd0c825e2d9d2f3b19999 (diff) | |
power_supply: Introduce maximum current property
USB only gives the maximum current allowed to draw.
Signed-off-by: Heikki Krogerus <ext-heikki.krogerus@nokia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 1 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 1 | 
2 files changed, 2 insertions, 0 deletions
| diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 88f5e43100c2..cd1f90754a3a 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
| @@ -139,6 +139,7 @@ static struct device_attribute power_supply_attrs[] = { | |||
| 139 | POWER_SUPPLY_ATTR(voltage_min_design), | 139 | POWER_SUPPLY_ATTR(voltage_min_design), | 
| 140 | POWER_SUPPLY_ATTR(voltage_now), | 140 | POWER_SUPPLY_ATTR(voltage_now), | 
| 141 | POWER_SUPPLY_ATTR(voltage_avg), | 141 | POWER_SUPPLY_ATTR(voltage_avg), | 
| 142 | POWER_SUPPLY_ATTR(current_max), | ||
| 142 | POWER_SUPPLY_ATTR(current_now), | 143 | POWER_SUPPLY_ATTR(current_now), | 
| 143 | POWER_SUPPLY_ATTR(current_avg), | 144 | POWER_SUPPLY_ATTR(current_avg), | 
| 144 | POWER_SUPPLY_ATTR(power_now), | 145 | POWER_SUPPLY_ATTR(power_now), | 
| diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index d37fef67ece2..7d7325685c42 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h | |||
| @@ -89,6 +89,7 @@ enum power_supply_property { | |||
| 89 | POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, | 89 | POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, | 
| 90 | POWER_SUPPLY_PROP_VOLTAGE_NOW, | 90 | POWER_SUPPLY_PROP_VOLTAGE_NOW, | 
| 91 | POWER_SUPPLY_PROP_VOLTAGE_AVG, | 91 | POWER_SUPPLY_PROP_VOLTAGE_AVG, | 
| 92 | POWER_SUPPLY_PROP_CURRENT_MAX, | ||
| 92 | POWER_SUPPLY_PROP_CURRENT_NOW, | 93 | POWER_SUPPLY_PROP_CURRENT_NOW, | 
| 93 | POWER_SUPPLY_PROP_CURRENT_AVG, | 94 | POWER_SUPPLY_PROP_CURRENT_AVG, | 
| 94 | POWER_SUPPLY_PROP_POWER_NOW, | 95 | POWER_SUPPLY_PROP_POWER_NOW, | 
