From: Tony Lindgren <tony@atomide.com>
To: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org, linux-omap@vger.kernel.org,
Merlijn Wajer <merlijn@wizzup.org>, Pavel Machek <pavel@ucw.cz>
Subject: [PATCH 3/3] RFC: power: supply: cpcap-battery: Implement capacity percentage
Date: Sun, 19 Jan 2020 12:11:24 -0800 [thread overview]
Message-ID: <20200119201124.29620-3-tony@atomide.com> (raw)
In-Reply-To: <20200119201124.29620-1-tony@atomide.com>
Based on the saved high and low states, we can estimate battery state
based on the coulomb counter:
# cat /sys/class/power_supply/battery/capacity
...
Note that this too should probably be updated to use ocv-capacity-table.
Also note that I have not verified the shown capacity is very accurate.
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Not-yet-Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/power/supply/cpcap-battery.c | 35 ++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -504,6 +504,15 @@ static int cpcap_battery_get_rough_capacity(struct cpcap_battery_ddata *ddata)
return capacity;
}
+static int cpcap_battery_get_rough_percentage(struct cpcap_battery_ddata *ddata)
+{
+ int percentage = 0;
+
+ cpcap_battery_get_rough(ddata, NULL, &percentage);
+
+ return percentage;
+}
+
static enum power_supply_property cpcap_battery_props[] = {
POWER_SUPPLY_PROP_STATUS,
POWER_SUPPLY_PROP_PRESENT,
@@ -518,6 +527,7 @@ static enum power_supply_property cpcap_battery_props[] = {
POWER_SUPPLY_PROP_CHARGE_COUNTER,
POWER_SUPPLY_PROP_POWER_NOW,
POWER_SUPPLY_PROP_POWER_AVG,
+ POWER_SUPPLY_PROP_CAPACITY,
POWER_SUPPLY_PROP_CAPACITY_LEVEL,
POWER_SUPPLY_PROP_SCOPE,
POWER_SUPPLY_PROP_TEMP,
@@ -528,10 +538,10 @@ static int cpcap_battery_get_property(struct power_supply *psy,
union power_supply_propval *val)
{
struct cpcap_battery_ddata *ddata = power_supply_get_drvdata(psy);
- struct cpcap_battery_state_data *latest, *previous;
+ struct cpcap_battery_state_data *latest, *previous, *low, *high;
u32 sample;
s32 accumulator;
- int cached;
+ int cached, delta, est;
s64 tmp;
cached = cpcap_battery_update_status(ddata);
@@ -608,6 +618,27 @@ static int cpcap_battery_get_property(struct power_supply *psy,
tmp *= ((latest->voltage + previous->voltage) / 20000);
val->intval = div64_s64(tmp, 100);
break;
+ case POWER_SUPPLY_PROP_CAPACITY:
+ est = cpcap_battery_get_rough_percentage(ddata);
+ high = cpcap_battery_get_highest(ddata);
+ if (high->voltage) {
+ delta = latest->counter_uah - high->counter_uah;
+ val->intval = (ddata->config.info.charge_full_design -
+ delta) * 100;
+ val->intval /= ddata->config.info.charge_full_design;
+ delta = abs(val->intval - est);
+ break;
+ }
+ low = cpcap_battery_get_lowest(ddata);
+ if (low->voltage) {
+ delta = low->counter_uah - latest->counter_uah;
+ val->intval = (delta * 100) /
+ ddata->config.info.charge_full_design;
+ delta = abs(val->intval - est);
+ break;
+ }
+ val->intval = est;
+ break;
case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
val->intval = cpcap_battery_get_rough_capacity(ddata);
break;
--
2.24.1
next prev parent reply other threads:[~2020-01-19 20:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 20:11 [PATCH 1/3] RFC: power: supply: cpcap-battery: Add helper for rough capacity Tony Lindgren
2020-01-19 20:11 ` [PATCH 2/3] RFC: power: supply: cpcap-battery: Save high and low states Tony Lindgren
2020-01-19 20:11 ` Tony Lindgren [this message]
2020-01-21 9:57 ` [PATCH 1/3] RFC: power: supply: cpcap-battery: Add helper for rough capacity Pavel Machek
2020-01-21 10:42 ` Merlijn Wajer
2020-01-21 22:25 ` Pavel Machek
2020-01-23 16:02 ` Tony Lindgren
2020-03-10 4:54 ` Arthur D.
2020-03-10 15:39 ` Tony Lindgren
2020-03-10 18:35 ` Arthur D.
2020-03-11 14:23 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200119201124.29620-3-tony@atomide.com \
--to=tony@atomide.com \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=merlijn@wizzup.org \
--cc=pavel@ucw.cz \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).