From: Arthur Demchenkov <spinal.by@gmail.com>
To: Tony Lindgren <tony@atomide.com>,
Merlijn Wajer <merlijn@wizzup.org>, Pavel Machek <pavel@ucw.cz>,
sre@kernel.org, linux-pm@vger.kernel.org,
linux-omap@vger.kernel.org
Cc: Arthur Demchenkov <spinal.by@gmail.com>
Subject: [PATCH 14/15] power: supply: cpcap-battery: Make it behave like bq27200
Date: Sun, 15 Mar 2020 18:12:05 +0300 [thread overview]
Message-ID: <20200315151206.30909-14-spinal.by@gmail.com> (raw)
In-Reply-To: <20200315151206.30909-1-spinal.by@gmail.com>
Now we begin to update the charge_now value immediately after connecting
or disconnecting the charger. No more hidden mAh buffer when the battery
is fully charged or discharged.
Signed-off-by: Arthur Demchenkov <spinal.by@gmail.com>
---
drivers/power/supply/cpcap-battery.c | 44 +++++++++++++++---------------------
1 file changed, 18 insertions(+), 26 deletions(-)
diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
index 938117638983..4e872bd36ccf 100644
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -468,35 +468,27 @@ static int cpcap_battery_update_status(struct cpcap_battery_ddata *ddata)
if (cpcap_battery_full(ddata)) {
full = cpcap_battery_get_full(ddata);
- /* Update full state value? */
- if (!full->voltage) {
- memcpy(full, latest, sizeof(*full));
-
- empty = cpcap_battery_get_empty(ddata);
- if (empty->voltage) {
- ddata->charge_full =
- empty->counter_uah - full->counter_uah;
- empty->voltage = -1;
- } else if (ddata->charge_full) {
- /* Initialize with user provided data */
- empty->counter_uah =
- full->counter_uah + ddata->charge_full;
- /* Mark it as initialized */
- empty->voltage = -1;
- }
+ memcpy(full, latest, sizeof(*full));
+
+ empty = cpcap_battery_get_empty(ddata);
+ if (empty->voltage && empty->voltage != -1) {
+ empty->voltage = -1;
+ ddata->charge_full =
+ empty->counter_uah - full->counter_uah;
+ } else if (ddata->charge_full) {
+ empty->voltage = -1;
+ empty->counter_uah =
+ full->counter_uah + ddata->charge_full;
}
} else if (cpcap_battery_low(ddata)) {
empty = cpcap_battery_get_empty(ddata);
- /* Update empty state value? */
- if (!empty->voltage || empty->voltage == -1) {
- memcpy(empty, latest, sizeof(*empty));
-
- full = cpcap_battery_get_full(ddata);
- if (full->voltage) {
- ddata->charge_full =
- empty->counter_uah - full->counter_uah;
- full->voltage = 0;
- }
+ memcpy(empty, latest, sizeof(*empty));
+
+ full = cpcap_battery_get_full(ddata);
+ if (full->voltage) {
+ full->voltage = 0;
+ ddata->charge_full =
+ empty->counter_uah - full->counter_uah;
}
}
--
2.11.0
next prev parent reply other threads:[~2020-03-15 15:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-15 15:11 [PATCH 01/15] power: supply: cpcap-battery: Fix battery full status reporting Arthur Demchenkov
2020-03-15 15:11 ` [PATCH 02/15] power: supply: cpcap-battery: Improve battery full status detection Arthur Demchenkov
2020-03-15 16:46 ` Tony Lindgren
2020-03-15 15:11 ` [PATCH 03/15] power: supply: cpcap-battery: Fix battery low status reporting Arthur Demchenkov
2020-03-21 14:47 ` Tony Lindgren
2020-03-21 21:40 ` Arthur D.
2020-03-15 15:11 ` [PATCH 04/15] power: supply: cpcap-battery: Add charge_full property Arthur Demchenkov
2020-03-15 15:11 ` [PATCH 05/15] power: supply: cpcap-battery: Add charge_now property Arthur Demchenkov
2020-03-15 15:11 ` [PATCH 06/15] power: supply: cpcap-battery: Initialize with user provided data Arthur Demchenkov
2020-03-21 14:54 ` Tony Lindgren
2020-03-21 22:08 ` Arthur D.
2020-03-21 22:21 ` Tony Lindgren
2020-03-15 15:11 ` [PATCH 07/15] power: supply: cpcap-battery: Rewrite capacity reporting Arthur Demchenkov
2020-03-15 15:11 ` [PATCH 08/15] power: supply: cpcap-battery: Get rid of rough capacity percentage Arthur Demchenkov
2020-03-15 15:12 ` [PATCH 09/15] power: supply: cpcap-battery: Increse low voltage bound Arthur Demchenkov
2020-03-15 15:12 ` [PATCH 10/15] power: supply: cpcap-battery: Improve full status reporting Arthur Demchenkov
2020-03-15 15:12 ` [PATCH 11/15] power: supply: cpcap-battery: Rename properties, variables and functions Arthur Demchenkov
2020-03-15 15:12 ` [PATCH 12/15] power: supply: cpcap-battery: stabilize charge_full value Arthur Demchenkov
2020-03-15 15:12 ` [PATCH 13/15] power: supply: cpcap-battery: Fine tune end of charge current Arthur Demchenkov
2020-03-15 15:12 ` Arthur Demchenkov [this message]
2020-03-15 15:12 ` [PATCH 15/15] power: supply: cpcap-battery: Add rounding to capacity reporting Arthur Demchenkov
2020-03-15 18:58 ` [PATCH 01/15] power: supply: cpcap-battery: Fix battery full status reporting Pavel Machek
2020-03-15 19:19 ` Tony Lindgren
2020-03-15 20:51 ` Arthur D.
2020-03-15 21:59 ` Tony Lindgren
2020-03-16 1:30 ` Arthur D.
2020-03-16 16:02 ` 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=20200315151206.30909-14-spinal.by@gmail.com \
--to=spinal.by@gmail.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 \
--cc=tony@atomide.com \
/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).