From: NeilBrown <neilb@suse.de>
To: Tony Lindgren <tony@atomide.com>, Felipe Balbi <balbi@ti.com>,
Kishon Vijay Abraham I <kishon@ti.com>
Cc: linux-omap@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>
Cc: GTA04 owners <gta04-owner@goldelico.com>
Subject: [PATCH 2/4] usb: phy: twl4030: allow charger to see usb current draw limits.
Date: Tue, 24 Feb 2015 14:40:37 +1100 [thread overview]
Message-ID: <20150224034037.31400.26595.stgit@notabene.brown> (raw)
In-Reply-To: <20150224033730.31400.78200.stgit@notabene.brown>
The charger needs to know when a USB gadget has been enumerated
and what the agreed maximum current was so that it can adjust
charging accordingly.
So define a "set_power()" function to record the permitted
draw, and pass a pointer to that when sending USB_EVENT_ENUMERATED
notification.
Signed-off-by: NeilBrown <neilb@suse.de>
---
drivers/phy/phy-twl4030-usb.c | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 97c59074233f..023fe150c7a1 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -163,6 +163,11 @@ struct twl4030_usb {
enum omap_musb_vbus_id_status linkstat;
bool vbus_supplied;
+ /* Permitted vbus draw - only meaningful after
+ * USB_EVENT_ENUMERATED
+ */
+ unsigned vbus_draw;
+
struct delayed_work id_workaround_work;
};
@@ -547,12 +552,7 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
mutex_unlock(&twl->lock);
if (status_changed) {
- /* FIXME add a set_power() method so that B-devices can
- * configure the charger appropriately. It's not always
- * correct to consume VBUS power, and how much current to
- * consume is a function of the USB configuration chosen
- * by the host.
- *
+ /*
* REVISIT usb_gadget_vbus_connect(...) as needed, ditto
* its disconnect() sibling, when changing to/from the
* USB_LINK_VBUS state. musb_hdrc won't care until it
@@ -625,6 +625,20 @@ static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host)
return 0;
}
+static int twl4030_set_power(struct usb_phy *phy, unsigned mA)
+{
+ struct twl4030_usb *twl = phy_to_twl(phy);
+
+ if (twl->vbus_draw != mA) {
+ phy->last_event = USB_EVENT_ENUMERATED;
+ twl->vbus_draw = mA;
+ atomic_notifier_call_chain(&phy->notifier,
+ USB_EVENT_ENUMERATED,
+ &twl->vbus_draw);
+ }
+ return 0;
+}
+
static const struct phy_ops ops = {
.init = twl4030_phy_init,
.power_on = twl4030_phy_power_on,
@@ -675,6 +689,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
twl->phy.label = "twl4030";
twl->phy.otg = otg;
twl->phy.type = USB_PHY_TYPE_USB2;
+ twl->phy.set_power = twl4030_set_power;
otg->usb_phy = &twl->phy;
otg->set_host = twl4030_set_host;
next prev parent reply other threads:[~2015-02-24 3:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 3:40 [PATCH 0/4] Enhancements to twl4030 phy to support better charging NeilBrown
2015-02-24 3:40 ` NeilBrown [this message]
2015-03-02 21:03 ` [PATCH 2/4] usb: phy: twl4030: allow charger to see usb current draw limits Pavel Machek
2015-03-04 6:17 ` NeilBrown
2015-02-24 3:40 ` [PATCH 1/4] usb: phy: twl4030: make runtime pm more reliable NeilBrown
2015-02-24 20:44 ` Tony Lindgren
2015-03-02 21:03 ` Pavel Machek
2015-03-04 6:24 ` NeilBrown
2015-02-24 3:40 ` [PATCH 4/4] usb: phy: twl4030: test ID resistance to see if charger is present NeilBrown
2015-03-02 21:04 ` Pavel Machek
2015-03-04 6:40 ` NeilBrown
2015-02-24 3:40 ` [PATCH 3/4] usb: phy: twl4030: add support for reading restore on ID pin NeilBrown
2015-03-02 21:04 ` Pavel Machek
2015-03-04 6:35 ` NeilBrown
2015-03-04 6:54 ` [Gta04-owner] " Dr. H. Nikolaus Schaller
2015-03-22 6:05 ` NeilBrown
2015-03-04 10:17 ` Pavel Machek
2015-02-24 20:46 ` [PATCH 0/4] Enhancements to twl4030 phy to support better charging Tony Lindgren
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=20150224034037.31400.26595.stgit@notabene.brown \
--to=neilb@suse.de \
--cc=balbi@ti.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome