From: Tony Lindgren <tony@atomide.com>
To: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org, linux-omap@vger.kernel.org,
Arthur Demchenkov <spinal.by@gmail.com>,
Carl Philipp Klemm <philipp@uvos.xyz>,
Merlijn Wajer <merlijn@wizzup.org>, Pavel Machek <pavel@ucw.cz>
Subject: [PATCH 13/15] power: supply: cpcap-battery: Implement capacity reporting
Date: Sun, 10 Jan 2021 21:54:01 +0200 [thread overview]
Message-ID: <20210110195403.13758-14-tony@atomide.com> (raw)
In-Reply-To: <20210110195403.13758-1-tony@atomide.com>
From: Arthur Demchenkov <spinal.by@gmail.com>
Calculate percentage using charge_full value provided.
Cc: Arthur Demchenkov <spinal.by@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Arthur Demchenkov <spinal.by@gmail.com>
[tony@atomide.com: updated to apply after dropping my earlier patch]
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/power/supply/cpcap-battery.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
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
@@ -546,6 +546,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,
@@ -556,7 +557,7 @@ 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, *empty;
u32 sample;
s32 accumulator;
int cached;
@@ -636,6 +637,16 @@ 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:
+ empty = cpcap_battery_get_empty(ddata);
+ if (!empty->voltage || !ddata->charge_full)
+ return -ENODATA;
+ /* (ddata->charge_full / 200) is needed for rounding */
+ val->intval = empty->counter_uah - latest->counter_uah +
+ ddata->charge_full / 200;
+ val->intval = clamp(val->intval, 0, ddata->charge_full);
+ val->intval = val->intval * 100 / ddata->charge_full;
+ break;
case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
if (cpcap_battery_full(ddata))
val->intval = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
--
2.30.0
next prev parent reply other threads:[~2021-01-10 19:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-10 19:53 [PATCH 00/15] Updates for cpcap charger and battery Tony Lindgren
2021-01-10 19:53 ` [PATCH 01/15] power: supply: cpcap-charger: Fix missing power_supply_put() Tony Lindgren
2021-01-10 19:53 ` [PATCH 02/15] power: supply: cpcap-battery: " Tony Lindgren
2021-01-10 19:53 ` [PATCH 03/15] power: supply: cpcap-charger: Fix flakey reboot with charger connected Tony Lindgren
2021-01-10 19:53 ` [PATCH 04/15] power: supply: cpcap-charger: Make VBUS already provided debug only Tony Lindgren
2021-01-10 19:53 ` [PATCH 05/15] power: supply: cpcap-charger: Use standard enumeration Tony Lindgren
2021-01-10 19:53 ` [PATCH 06/15] power: supply: cpcap-charger: Limiting charge current on Droid 4 Tony Lindgren
2021-01-10 19:53 ` [PATCH 07/15] power: supply: cpcap-charger: Drop internal state and use generic stats Tony Lindgren
2021-01-10 19:53 ` [PATCH 08/15] power: supply: cpcap-charger: Simplify things with enable and disable Tony Lindgren
2021-01-10 19:53 ` [PATCH 09/15] power: supply: cpcap-charger: Provide state updates for battery from charger Tony Lindgren
2021-01-10 19:53 ` [PATCH 10/15] power: supply: cpcap-battery: Use charger status for battery full detection Tony Lindgren
2021-01-10 19:53 ` [PATCH 11/15] power: supply: cpcap-battery: Add charge_full property Tony Lindgren
2021-01-10 19:54 ` [PATCH 12/15] power: supply: cpcap-battery: Keep track of state for capacity reporting Tony Lindgren
2021-01-10 19:54 ` Tony Lindgren [this message]
2021-01-10 19:54 ` [PATCH 14/15] power: supply: cpcap-battery: Add charge_now property Tony Lindgren
2021-01-10 19:54 ` [PATCH 15/15] power: supply: cpcap-battery: Fix typo Tony Lindgren
2021-01-14 22:37 ` [PATCH 00/15] Updates for cpcap charger and battery Sebastian Reichel
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=20210110195403.13758-14-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=philipp@uvos.xyz \
--cc=spinal.by@gmail.com \
--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).