diff options
author | Ramakrishna Pallala <ramakrishna.pallala@intel.com> | 2012-10-09 12:55:29 -0400 |
---|---|---|
committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-11-17 23:21:43 -0500 |
commit | ea2ce92e44dc83b7a69c2aedd9c52bfe7fee1a62 (patch) | |
tree | bd7a548752735e355b88f2864bd24521e79ff865 | |
parent | a77d60aec70183faa68b7df4a3fa89fbaf592cf5 (diff) |
power_supply: Add support for CHARGE_CONTROL_* attributes
Add support for power supply attributes CHARGE_CONTROL_LIMIT
and CHARGE_CONTROL_LIMIT_MAX.
These new attributes will enable the user space to implement
custom charging algorithms based on platform state.
Signed-off-by: Ramakrishna Pallala <ramakrishna.pallala@intel.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
-rw-r--r-- | Documentation/power/power_supply_class.txt | 3 | ||||
-rw-r--r-- | drivers/power/power_supply_sysfs.c | 2 | ||||
-rw-r--r-- | include/linux/power_supply.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/power/power_supply_class.txt b/Documentation/power/power_supply_class.txt index 9c647bd7c5a..3f10b39b034 100644 --- a/Documentation/power/power_supply_class.txt +++ b/Documentation/power/power_supply_class.txt | |||
@@ -123,6 +123,9 @@ CONSTANT_CHARGE_VOLTAGE - constant charge voltage programmed by charger. | |||
123 | CONSTANT_CHARGE_VOLTAGE_MAX - maximum charge voltage supported by the | 123 | CONSTANT_CHARGE_VOLTAGE_MAX - maximum charge voltage supported by the |
124 | power supply object. | 124 | power supply object. |
125 | 125 | ||
126 | CHARGE_CONTROL_LIMIT - current charge control limit setting | ||
127 | CHARGE_CONTROL_LIMIT_MAX - maximum charge control limit setting | ||
128 | |||
126 | ENERGY_FULL, ENERGY_EMPTY - same as above but for energy. | 129 | ENERGY_FULL, ENERGY_EMPTY - same as above but for energy. |
127 | 130 | ||
128 | CAPACITY - capacity in percents. | 131 | CAPACITY - capacity in percents. |
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 395c2cfa16c..40fa3b7cae5 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
@@ -164,6 +164,8 @@ static struct device_attribute power_supply_attrs[] = { | |||
164 | POWER_SUPPLY_ATTR(constant_charge_current_max), | 164 | POWER_SUPPLY_ATTR(constant_charge_current_max), |
165 | POWER_SUPPLY_ATTR(constant_charge_voltage), | 165 | POWER_SUPPLY_ATTR(constant_charge_voltage), |
166 | POWER_SUPPLY_ATTR(constant_charge_voltage_max), | 166 | POWER_SUPPLY_ATTR(constant_charge_voltage_max), |
167 | POWER_SUPPLY_ATTR(charge_control_limit), | ||
168 | POWER_SUPPLY_ATTR(charge_control_limit_max), | ||
167 | POWER_SUPPLY_ATTR(energy_full_design), | 169 | POWER_SUPPLY_ATTR(energy_full_design), |
168 | POWER_SUPPLY_ATTR(energy_empty_design), | 170 | POWER_SUPPLY_ATTR(energy_empty_design), |
169 | POWER_SUPPLY_ATTR(energy_full), | 171 | POWER_SUPPLY_ATTR(energy_full), |
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index e5ef45834c3..445b4b249af 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h | |||
@@ -114,6 +114,8 @@ enum power_supply_property { | |||
114 | POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, | 114 | POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, |
115 | POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE, | 115 | POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE, |
116 | POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX, | 116 | POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX, |
117 | POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT, | ||
118 | POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX, | ||
117 | POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN, | 119 | POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN, |
118 | POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN, | 120 | POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN, |
119 | POWER_SUPPLY_PROP_ENERGY_FULL, | 121 | POWER_SUPPLY_PROP_ENERGY_FULL, |