LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: Rodolfo Giometti <giometti@linux.it>,
	Grazvydas Ignotas <notasas@gmail.com>,
	linux-kernel@vger.kernel.org,
	Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 11/14] POWER: bq27x00: Give more specific reports on battery status
Date: Sun,  6 Feb 2011 01:48:08 +0100	[thread overview]
Message-ID: <1296953291-10373-12-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1296953291-10373-1-git-send-email-lars@metafoo.de>

The current code only reports whether the battery is charging or discharging.
But the battery also reports whether it is fully charged, furthermore by look at
if the battery is supplied we can tell whether it is discharging or not
charging.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/power/bq27x00_battery.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 7540364..961238f 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -54,6 +54,7 @@
 #define BQ27000_REG_RSOC		0x0B /* Relative State-of-Charge */
 #define BQ27000_REG_ILMD		0x76 /* Initial last measured discharge */
 #define BQ27000_FLAG_CHGS		BIT(7)
+#define BQ27000_FLAG_FC			BIT(5)
 
 #define BQ27500_REG_SOC			0x2c
 #define BQ27500_REG_DCAP		0x3C /* Design capacity */
@@ -395,8 +396,12 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di,
 		else
 			status = POWER_SUPPLY_STATUS_CHARGING;
 	} else {
-		if (di->cache.flags & BQ27000_FLAG_CHGS)
+		if (di->cache.flags & BQ27000_FLAG_FC)
+			status = POWER_SUPPLY_STATUS_FULL;
+		else if (di->cache.flags & BQ27000_FLAG_CHGS)
 			status = POWER_SUPPLY_STATUS_CHARGING;
+		else if (power_supply_am_i_supplied(&di->bat))
+			status = POWER_SUPPLY_STATUS_NOT_CHARGING;
 		else
 			status = POWER_SUPPLY_STATUS_DISCHARGING;
 	}
-- 
1.7.2.3


  parent reply	other threads:[~2011-02-06 16:34 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-06  0:47 [PATCH 00/14] POWER: BQ27x00: New Properties, fixes, bq27000 support Lars-Peter Clausen
2011-02-06  0:47 ` [PATCH 01/14] POWER: bq27x00: Add type property Lars-Peter Clausen
2011-02-06 16:43   ` Rodolfo Giometti
2011-02-06  0:47 ` [PATCH 02/14] POWER: bq27x00: Improve temperature precession Lars-Peter Clausen
2011-02-07  8:06   ` Rodolfo Giometti
2011-02-06  0:48 ` [PATCH 03/14] POWER: bq27x00: Fix current now property Lars-Peter Clausen
2011-02-07  8:07   ` Rodolfo Giometti
2011-02-06  0:48 ` [PATCH 04/14] POWER: bq27x00: Return -ENODEV for properties if the battery is not present Lars-Peter Clausen
2011-02-06 16:40   ` Rodolfo Giometti
2011-02-06  0:48 ` [PATCH 05/14] POWER: bq27x00: Prepare code for addition of bq27000 platform driver Lars-Peter Clausen
2011-02-07  8:09   ` Rodolfo Giometti
2011-02-06  0:48 ` [PATCH 06/14] POWER: bq27x00: Add bq27000 support Lars-Peter Clausen
2011-02-06  0:48 ` [PATCH 07/14] POWER: bq27X00: Cache battery registers Lars-Peter Clausen
2011-02-06  0:48 ` [PATCH 08/14] POWER: bq27x00: Poll battery state Lars-Peter Clausen
2011-02-06  0:48 ` [PATCH 09/14] POWER: bq27x00: Add new properties Lars-Peter Clausen
2011-02-06  0:48 ` [PATCH 10/14] POWER: bq27x00: Add MODULE_DEVICE_TABLE Lars-Peter Clausen
2011-02-06 16:49   ` Rodolfo Giometti
2011-02-06  0:48 ` Lars-Peter Clausen [this message]
2011-02-06 16:38   ` [PATCH 11/14] POWER: bq27x00: Give more specific reports on battery status Rodolfo Giometti
2011-02-06  0:48 ` [PATCH 12/14] POWER: bq27x00: Minor cleanups Lars-Peter Clausen
2011-02-06  0:48 ` [PATCH 13/14] POWER: bq27x00: Cleanup bq27x00_i2c_read Lars-Peter Clausen
2011-02-06  0:48 ` [PATCH 14/14] POWER: Ignore -ENODATA errors when generating a uevent Lars-Peter Clausen
2011-02-06 22:47 ` [PATCH 00/14] POWER: BQ27x00: New Properties, fixes, bq27000 support Felipe Contreras
2011-02-06 23:09   ` Lars-Peter Clausen
2011-02-07  0:00     ` Felipe Contreras
2011-02-07  0:12       ` Lars-Peter Clausen
2011-02-07 10:52     ` Pali Rohár
2011-02-07  0:58 ` Grazvydas Ignotas
2011-02-07  1:30   ` Lars-Peter Clausen
2011-02-08 11:40     ` Grazvydas Ignotas
2011-02-08 16:13       ` Lars-Peter Clausen
2011-02-08 16:28         ` Anton Vorontsov
2011-02-08 17:09           ` Lars-Peter Clausen

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=1296953291-10373-12-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=cbouatmailru@gmail.com \
    --cc=giometti@linux.it \
    --cc=linux-kernel@vger.kernel.org \
    --cc=notasas@gmail.com \
    --subject='Re: [PATCH 11/14] POWER: bq27x00: Give more specific reports on battery status' \
    /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

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).