diff options
author | Ramakrishna Pallala <ramakrishna.pallala@intel.com> | 2012-04-10 06:51:20 -0400 |
---|---|---|
committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-05-04 23:44:29 -0400 |
commit | a2ebfe2fc6e088a70d06cd15a5bc9bcb621cc195 (patch) | |
tree | e9c03e1cbcb7b98f6049c17bb6000ae5218ae754 /drivers/power | |
parent | 48e41c70c10f10541d922fc67e7952f06ad59d9a (diff) |
power_supply: Add voltage_ocv property and use it for max17042 driver
This adds a new sysfs file called 'voltage_ocv' which gives the
Open Circuit Voltage of the battery.
This property can be used for platform shutdown policies and
can be useful for initial capacity estimations.
Note: This patch is generated against linux-next branch.
Signed-off-by: Ramakrishna Pallala <ramakrishna.pallala@intel.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/max17042_battery.c | 8 | ||||
-rw-r--r-- | drivers/power/power_supply_sysfs.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c index 738648d1d9fc..42c4be9a664b 100644 --- a/drivers/power/max17042_battery.c +++ b/drivers/power/max17042_battery.c | |||
@@ -106,6 +106,7 @@ static enum power_supply_property max17042_battery_props[] = { | |||
106 | POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, | 106 | POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, |
107 | POWER_SUPPLY_PROP_VOLTAGE_NOW, | 107 | POWER_SUPPLY_PROP_VOLTAGE_NOW, |
108 | POWER_SUPPLY_PROP_VOLTAGE_AVG, | 108 | POWER_SUPPLY_PROP_VOLTAGE_AVG, |
109 | POWER_SUPPLY_PROP_VOLTAGE_OCV, | ||
109 | POWER_SUPPLY_PROP_CAPACITY, | 110 | POWER_SUPPLY_PROP_CAPACITY, |
110 | POWER_SUPPLY_PROP_CHARGE_FULL, | 111 | POWER_SUPPLY_PROP_CHARGE_FULL, |
111 | POWER_SUPPLY_PROP_TEMP, | 112 | POWER_SUPPLY_PROP_TEMP, |
@@ -172,6 +173,13 @@ static int max17042_get_property(struct power_supply *psy, | |||
172 | 173 | ||
173 | val->intval = ret * 625 / 8; | 174 | val->intval = ret * 625 / 8; |
174 | break; | 175 | break; |
176 | case POWER_SUPPLY_PROP_VOLTAGE_OCV: | ||
177 | ret = max17042_read_reg(chip->client, MAX17042_OCVInternal); | ||
178 | if (ret < 0) | ||
179 | return ret; | ||
180 | |||
181 | val->intval = ret * 625 / 8; | ||
182 | break; | ||
175 | case POWER_SUPPLY_PROP_CAPACITY: | 183 | case POWER_SUPPLY_PROP_CAPACITY: |
176 | ret = max17042_read_reg(chip->client, MAX17042_RepSOC); | 184 | ret = max17042_read_reg(chip->client, MAX17042_RepSOC); |
177 | if (ret < 0) | 185 | if (ret < 0) |
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 4368e7d61316..4150747f9186 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
@@ -146,6 +146,7 @@ static struct device_attribute power_supply_attrs[] = { | |||
146 | POWER_SUPPLY_ATTR(voltage_min_design), | 146 | POWER_SUPPLY_ATTR(voltage_min_design), |
147 | POWER_SUPPLY_ATTR(voltage_now), | 147 | POWER_SUPPLY_ATTR(voltage_now), |
148 | POWER_SUPPLY_ATTR(voltage_avg), | 148 | POWER_SUPPLY_ATTR(voltage_avg), |
149 | POWER_SUPPLY_ATTR(voltage_ocv), | ||
149 | POWER_SUPPLY_ATTR(current_max), | 150 | POWER_SUPPLY_ATTR(current_max), |
150 | POWER_SUPPLY_ATTR(current_now), | 151 | POWER_SUPPLY_ATTR(current_now), |
151 | POWER_SUPPLY_ATTR(current_avg), | 152 | POWER_SUPPLY_ATTR(current_avg), |