From: NeilBrown <neil@brown.name>
To: Sebastian Reichel <sre@kernel.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
linux-pm@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
David Woodhouse <dwmw2@infradead.org>,
linux-kernel@vger.kernel.org,
real GTA04 owners <gta04-owner@goldelico.com>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
Pavel Machek <pavel@ucw.cz>,
linux-omap@vger.kernel.org, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 10/13] twl4030_charger: add software controlled linear charging mode.
Date: Thu, 30 Jul 2015 10:11:24 +1000 [thread overview]
Message-ID: <20150730001124.4012.27784.stgit@noble> (raw)
In-Reply-To: <20150730001113.4012.18086.stgit@noble>
Add a 'continuous' option for usb charging which enables
the "linear" charging mode of the twl4030.
Linear charging does a good job with not-so-reliable power sources.
Auto mode does not work well as it switches off when voltage drops
momentarily. Care must be taken not to over-charge.
It was used with a bike hub dynamo since a year or so. In that case
there are automatically charging stops when the cyclist needs a break.
Original-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: NeilBrown <neil@brown.name>
---
.../ABI/testing/sysfs-class-power-twl4030 | 9 +++
drivers/power/twl4030_charger.c | 55 ++++++++++++++++++--
2 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-class-power-twl4030 b/Documentation/ABI/testing/sysfs-class-power-twl4030
index 40e0f919cbde..e8baa36aaa2b 100644
--- a/Documentation/ABI/testing/sysfs-class-power-twl4030
+++ b/Documentation/ABI/testing/sysfs-class-power-twl4030
@@ -24,3 +24,12 @@ Description:
"auto" - draw power as appropriate for detected
power source and battery status.
"off" - do not draw any power.
+ "continuous"
+ - activate mode described as "linear" in
+ TWL data sheets. This uses whatever
+ current is available and doesn't switch off
+ when voltage drops.
+
+ This is useful for unstable power sources
+ such as bicycle dynamo, but care should
+ be taken that battery is not over-charged.
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 6fa928ed3128..de5430deaf23 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -24,6 +24,8 @@
#include <linux/usb/otg.h>
#include <linux/i2c/twl4030-madc.h>
+#define TWL4030_BCIMDEN 0x00
+#define TWL4030_BCIMDKEY 0x01
#define TWL4030_BCIMSTATEC 0x02
#define TWL4030_BCIICHG 0x08
#define TWL4030_BCIVAC 0x0a
@@ -35,13 +37,16 @@
#define TWL4030_BCIIREF1 0x27
#define TWL4030_BCIIREF2 0x28
#define TWL4030_BCIMFKEY 0x11
+#define TWL4030_BCIMFEN3 0x14
#define TWL4030_BCIMFTH8 0x1d
#define TWL4030_BCIMFTH9 0x1e
+#define TWL4030_BCIWDKEY 0x21
#define TWL4030_BCIMFSTS1 0x01
#define TWL4030_BCIAUTOWEN BIT(5)
#define TWL4030_CONFIG_DONE BIT(4)
+#define TWL4030_CVENAC BIT(2)
#define TWL4030_BCIAUTOUSB BIT(1)
#define TWL4030_BCIAUTOAC BIT(0)
#define TWL4030_CGAIN BIT(5)
@@ -112,12 +117,13 @@ struct twl4030_bci {
int usb_mode; /* charging mode requested */
#define CHARGE_OFF 0
#define CHARGE_AUTO 1
+#define CHARGE_LINEAR 2
unsigned long event;
};
/* strings for 'usb_mode' values */
-static char *modes[] = { "off", "auto" };
+static char *modes[] = { "off", "auto", "continuous" };
/*
* clear and set bits on an given register on a given module
@@ -404,16 +410,42 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
bci->usb_enabled = 1;
}
- /* forcing the field BCIAUTOUSB (BOOT_BCI[1]) to 1 */
- ret = twl4030_clear_set_boot_bci(0, TWL4030_BCIAUTOUSB);
- if (ret < 0)
- return ret;
+ if (bci->usb_mode == CHARGE_AUTO)
+ /* forcing the field BCIAUTOUSB (BOOT_BCI[1]) to 1 */
+ ret = twl4030_clear_set_boot_bci(0, TWL4030_BCIAUTOUSB);
/* forcing USBFASTMCHG(BCIMFSTS4[2]) to 1 */
ret = twl4030_clear_set(TWL_MODULE_MAIN_CHARGE, 0,
TWL4030_USBFASTMCHG, TWL4030_BCIMFSTS4);
+ if (bci->usb_mode == CHARGE_LINEAR) {
+ twl4030_clear_set_boot_bci(TWL4030_BCIAUTOAC|TWL4030_CVENAC, 0);
+ /* Watch dog key: WOVF acknowledge */
+ ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0x33,
+ TWL4030_BCIWDKEY);
+ /* 0x24 + EKEY6: off mode */
+ ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0x2a,
+ TWL4030_BCIMDKEY);
+ /* EKEY2: Linear charge: USB path */
+ ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0x26,
+ TWL4030_BCIMDKEY);
+ /* WDKEY5: stop watchdog count */
+ ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0xf3,
+ TWL4030_BCIWDKEY);
+ /* enable MFEN3 access */
+ ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0x9c,
+ TWL4030_BCIMFKEY);
+ /* ICHGEOCEN - end-of-charge monitor (current < 80mA)
+ * (charging continues)
+ * ICHGLOWEN - current level monitor (charge continues)
+ * don't monitor over-current or heat save
+ */
+ ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0xf0,
+ TWL4030_BCIMFEN3);
+ }
} else {
ret = twl4030_clear_set_boot_bci(TWL4030_BCIAUTOUSB, 0);
+ ret |= twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0x2a,
+ TWL4030_BCIMDKEY);
if (bci->usb_enabled) {
pm_runtime_mark_last_busy(bci->transceiver->dev);
pm_runtime_put_autosuspend(bci->transceiver->dev);
@@ -652,6 +684,8 @@ twl4030_bci_mode_store(struct device *dev, struct device_attribute *attr,
mode = 0;
else if (sysfs_streq(buf, modes[1]))
mode = 1;
+ else if (sysfs_streq(buf, modes[2]))
+ mode = 2;
else
return -EINVAL;
twl4030_charger_enable_usb(bci, false);
@@ -750,6 +784,17 @@ static int twl4030_bci_get_property(struct power_supply *psy,
is_charging = state & TWL4030_MSTATEC_USB;
else
is_charging = state & TWL4030_MSTATEC_AC;
+ if (!is_charging) {
+ u8 s;
+ twl4030_bci_read(TWL4030_BCIMDEN, &s);
+ if (psy->desc->type == POWER_SUPPLY_TYPE_USB)
+ is_charging = s & 1;
+ else
+ is_charging = s & 2;
+ if (is_charging)
+ /* A little white lie */
+ state = TWL4030_MSTATEC_QUICK1;
+ }
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
next prev parent reply other threads:[~2015-07-30 0:25 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-30 0:11 [PATCH 00/13] Enhance twl4030_charger functionality. - V3 NeilBrown
2015-07-30 0:11 ` [PATCH 07/13] twl4030_charger: distinguish between USB current and 'AC' current NeilBrown
2015-08-07 3:11 ` Tony Lindgren
2015-08-07 3:45 ` NeilBrown
2015-08-07 4:21 ` Tony Lindgren
2015-08-07 5:13 ` Sebastian Reichel
2015-08-07 5:29 ` NeilBrown
2015-07-30 0:11 ` [PATCH 09/13] twl4030_charger: enable manual enable/disable of usb charging NeilBrown
2015-07-30 0:11 ` [PATCH 01/13] twl4030_charger: use runtime_pm to keep usb phy active while charging NeilBrown
2015-09-15 11:29 ` Pavel Machek
2015-07-30 0:11 ` [PATCH 04/13] twl4030_charger: trust phy to determine when USB power is available NeilBrown
2015-09-15 11:30 ` Pavel Machek
2015-07-30 0:11 ` [PATCH 11/13] twl4030_charger: add ac/mode to match usb/mode NeilBrown
2015-07-30 0:11 ` NeilBrown
2015-07-30 0:11 ` [PATCH 12/13] twl4030_charger: Increase current carefully while watching voltage NeilBrown
2015-07-30 0:11 ` [PATCH 05/13] twl4030_charger: split uA calculation into a function NeilBrown
2015-07-30 0:11 ` [PATCH 02/13] twl4030_charger: convert to module_platform_driver instead of ..._probe NeilBrown
2015-07-30 0:11 ` [PATCH 08/13] twl4030_charger: allow max_current to be managed via sysfs NeilBrown
2015-07-30 0:11 ` [PATCH 06/13] twl4030_charger: allow fine control of charger current NeilBrown
2015-07-30 0:11 ` [PATCH 03/13] twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node NeilBrown
2015-08-18 8:07 ` Tony Lindgren
2015-08-19 0:28 ` NeilBrown
2015-08-19 6:25 ` Tony Lindgren
2015-08-27 20:51 ` Kevin Hilman
2015-09-02 3:25 ` Kevin Hilman
2015-09-02 6:19 ` Neil Brown
2015-09-02 6:19 ` Neil Brown
2015-09-02 13:07 ` Tony Lindgren
2015-09-08 18:32 ` Kevin Hilman
2015-09-08 20:14 ` Tony Lindgren
2015-09-10 8:08 ` Sebastian Reichel
2015-09-10 20:27 ` Sebastian Reichel
2015-09-10 20:43 ` Tony Lindgren
2015-07-30 0:11 ` NeilBrown [this message]
2015-09-15 11:28 ` [PATCH 10/13] twl4030_charger: add software controlled linear charging mode Pavel Machek
2015-09-15 12:08 ` [Gta04-owner] " Christ van Willegen
2015-09-15 12:08 ` Christ van Willegen
2015-10-01 6:14 ` Neil Brown
2015-10-06 14:34 ` Pavel Machek
2015-10-29 16:20 ` [Gta04-owner] " Andreas Kemnade
2015-10-29 16:20 ` Andreas Kemnade
2015-11-14 18:12 ` Pavel Machek
2015-11-14 18:12 ` Pavel Machek
2015-11-24 22:31 ` Andreas Kemnade
2015-11-24 22:31 ` Andreas Kemnade
2015-07-30 0:11 ` [PATCH 13/13] twl4030_charger: assume a 'charger' can supply maximum current NeilBrown
2015-08-05 3:35 ` [PATCH 00/13] Enhance twl4030_charger functionality. - V3 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=20150730001124.4012.27784.stgit@noble \
--to=neil@brown.name \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=gta04-owner@goldelico.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=sameo@linux.intel.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.