linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: NeilBrown <neilb@suse.de>
To: Samuel Ortiz <sameo@linux.intel.com>, Felipe Balbi <balbi@ti.com>,
	Grazvydas Ignotas <notasas@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-omap@vger.kernel.org, NeilBrown <neilb@suse.de>
Subject: [PATCH 3/6] twl4030_charger: allow charging whenever VBUS is present.
Date: Wed, 25 Apr 2012 17:33:10 +1000	[thread overview]
Message-ID: <20120425073310.20124.15112.stgit@notabene.brown> (raw)
In-Reply-To: <20120425072931.20124.56635.stgit@notabene.brown>

We currently refuse to charge if the USB ID pin is grounded, even
though VBUS might be present.
However some chargers do pull the ID pin low through a resistor which
might be as low as 47Kohm (openmoko charger).

The documentation is unclear but some experimental evidence suggests
that when the charge pump provides VBUS that doesn't get reflected in
HW_CONDITIONS, so we should be safe to ignore the ID pin.

Signed-off-by: NeilBrown <neilb@suse.de>
---

 drivers/power/twl4030_charger.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index 0511610..684662a 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -155,11 +155,7 @@ static int twl4030_bci_have_vbus(struct twl4030_bci *bci)
 
 	dev_dbg(bci->dev, "check_vbus: HW_CONDITIONS %02x\n", hwsts);
 
-	/* in case we also have STS_USB_ID, VBUS is driven by TWL itself */
-	if ((hwsts & TWL4030_STS_VBUS) && !(hwsts & TWL4030_STS_USB_ID))
-		return 1;
-
-	return 0;
+	return (hwsts & TWL4030_STS_VBUS);
 }
 
 /*



  parent reply	other threads:[~2012-04-25  7:34 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-25  7:33 [PATCH 0/6] twl4030: Various fixes for charing-from-USB NeilBrown
2012-04-25  7:33 ` [PATCH 2/6] twl4030_charger: add backup-battery charging NeilBrown
2012-04-25  7:33 ` [PATCH 1/6] twl4030_charger: Fix some typos NeilBrown
2012-04-25  7:33 ` NeilBrown [this message]
2012-04-25 11:33   ` [PATCH 3/6] twl4030_charger: allow charging whenever VBUS is present Grazvydas Ignotas
2012-04-29 23:34     ` NeilBrown
2012-04-25  7:33 ` [PATCH 6/6] twl4030-usb: Don't report EVENT_ID when there is VBUS NeilBrown
2012-04-25  8:05   ` Felipe Balbi
2012-04-25 10:29     ` NeilBrown
2012-04-25 11:44   ` Grazvydas Ignotas
2012-04-25  7:33 ` [PATCH 5/6] twl4030-usb: Don't power down phy when it is in-use by charger NeilBrown
2012-04-25  7:33 ` [PATCH 4/6] twl4030_charger: Allow charger to control the regulator that feeds it NeilBrown
2012-04-30 10:14   ` Tero Kristo
2012-05-01  1:01     ` NeilBrown
2012-05-09 16:06   ` Samuel Ortiz
2012-04-25 11:31 ` [PATCH 0/6] twl4030: Various fixes for charing-from-USB Grazvydas Ignotas
2012-04-29 23:30   ` NeilBrown
2012-05-05 10:49     ` Anton Vorontsov
2012-05-05 10:52       ` Anton Vorontsov
2012-05-10  1:24 ` Peter Chen
2012-05-10  2:37   ` NeilBrown
2012-05-10  6:46     ` Chen Peter-B29397
2012-05-10 14:45     ` Alan Stern

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=20120425073310.20124.15112.stgit@notabene.brown \
    --to=neilb@suse.de \
    --cc=balbi@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=notasas@gmail.com \
    --cc=sameo@linux.intel.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).