public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Fertser <fercerpav@gmail.com>
To: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>,
	linux-kernel@vger.kernel.org, Pavel Machek <pavel@ucw.cz>,
	Paul Fertser <fercerpav@gmail.com>
Subject: [PATCH 5/6] power: pcf50633: properly reenable charging when the supply conditions change
Date: Thu,  5 Nov 2009 00:24:58 +0300	[thread overview]
Message-ID: <1257369899-325-5-git-send-email-fercerpav@gmail.com> (raw)
In-Reply-To: <1257369899-325-4-git-send-email-fercerpav@gmail.com>

If chgmod == BATFULL, setting chgena has no effect. Datasheet says we
need to set resume instead but when autoresume is used resume doesn't
work. Clear and set chgena instead.

This enables a user to force charging by re-plugging USB even when the
charger entered Battery Full mode, might be handy before a long trip.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
---
 drivers/power/pcf50633-charger.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index 3383119..4718733 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -92,14 +92,18 @@ int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
 	chgmod = (mbcs2 & PCF50633_MBCS2_MBC_MASK);
 
 	/* If chgmod == BATFULL, setting chgena has no effect.
-	 * We need to set resume instead.
+	 * Datasheet says we need to set resume instead but when autoresume is
+	 * used resume doesn't work. Clear and set chgena instead.
 	 */
 	if (chgmod != PCF50633_MBCS2_MBC_BAT_FULL)
 		pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
 				PCF50633_MBCC1_CHGENA, PCF50633_MBCC1_CHGENA);
-	else
+	else {
+		pcf50633_reg_clear_bits(pcf, PCF50633_REG_MBCC1,
+				PCF50633_MBCC1_CHGENA);
 		pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-				PCF50633_MBCC1_RESUME, PCF50633_MBCC1_RESUME);
+				PCF50633_MBCC1_CHGENA, PCF50633_MBCC1_CHGENA);
+	}
 
 	mbc->usb_active = charging_start;
 
-- 
1.6.4.4


  reply	other threads:[~2009-11-04 21:26 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-04 21:24 [PATCH 1/6] power: pcf50633: add ac power supply class to the charger Paul Fertser
2009-11-04 21:24 ` [PATCH 2/6] power: pcf50633: introduces battery charging current control Paul Fertser
2009-11-04 21:24   ` [PATCH 3/6] gta02: set pcf50633 charger_reference_current_ma Paul Fertser
2009-11-04 21:24     ` [PATCH 4/6] power: pcf50633: get rid of charging restart software auto-triggering Paul Fertser
2009-11-04 21:24       ` Paul Fertser [this message]
2009-11-04 21:24         ` [PATCH 6/6] power: pcf50633: query charger status directly Paul Fertser
2009-11-04 21:46         ` [PATCH 5/6] power: pcf50633: properly reenable charging when the supply conditions change Pavel Machek
2009-11-04 22:24           ` Paul Fertser
2009-11-04 23:16             ` Pavel Machek
2009-11-04 23:45             ` Anton Vorontsov
2009-11-04 23:56               ` Pavel Machek
2009-11-11 13:48     ` [PATCH 3/6] gta02: set pcf50633 charger_reference_current_ma Paul Fertser
2009-11-11 15:31       ` Anton Vorontsov
2009-11-12  7:40         ` Pavel Machek
2009-11-12 21:59           ` Russell King - ARM Linux
2009-11-13 18:26             ` Pavel Machek
2009-11-16  1:00       ` Anton Vorontsov

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=1257369899-325-5-git-send-email-fercerpav@gmail.com \
    --to=fercerpav@gmail.com \
    --cc=cbou@mail.ru \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pavel@ucw.cz \
    /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