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 5/6] twl4030-usb: Don't power down phy when it is in-use by charger.
Date: Wed, 25 Apr 2012 17:33:11 +1000 [thread overview]
Message-ID: <20120425073311.20124.75294.stgit@notabene.brown> (raw)
In-Reply-To: <20120425072931.20124.56635.stgit@notabene.brown>
The USB phy is used both for data transfer and to charge the battery.
If the charger it active it will hold a reference to
usb3v1. In that case we don't want to power-down the phy.
This allows charging to continue while the device is suspended.
Signed-off-by: NeilBrown <neilb@suse.de>
---
drivers/usb/otg/twl4030-usb.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index c4a86da..bd8fe9b 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -388,10 +388,16 @@ static void twl4030_phy_power(struct twl4030_usb *twl, int on)
(PHY_CLK_CTRL_CLOCKGATING_EN |
PHY_CLK_CTRL_CLK32K_EN));
} else {
- __twl4030_phy_power(twl, 0);
regulator_disable(twl->usb1v5);
regulator_disable(twl->usb1v8);
regulator_disable(twl->usb3v1);
+ if (!regulator_is_enabled(twl->usb3v1))
+ /* no-one else is requesting this
+ * so it is OK to power-down the
+ * phy. Sometimes a charger might
+ * hold the regulator active.
+ */
+ __twl4030_phy_power(twl, 0);
}
}
next prev parent reply other threads:[~2012-04-25 7:35 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 1/6] twl4030_charger: Fix some typos NeilBrown
2012-04-25 7:33 ` [PATCH 3/6] twl4030_charger: allow charging whenever VBUS is present NeilBrown
2012-04-25 11:33 ` Grazvydas Ignotas
2012-04-29 23:34 ` NeilBrown
2012-04-25 7:33 ` [PATCH 2/6] twl4030_charger: add backup-battery charging NeilBrown
2012-04-25 7:33 ` NeilBrown [this message]
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 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 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=20120425073311.20124.75294.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).