From: Baolin Wang <baolin.wang@linaro.org>
To: balbi@kernel.org, gregkh@linuxfoundation.org, sre@kernel.org,
dbaryshkov@gmail.com, dwmw2@infradead.org
Cc: robh@kernel.org, jun.li@nxp.com, m.szyprowski@samsung.com,
ruslan.bilovol@gmail.com, peter.chen@freescale.com,
stern@rowland.harvard.edu, grygorii.strashko@ti.com,
yoshihiro.shimoda.uh@renesas.com, lee.jones@linaro.org,
broonie@kernel.org, john.stultz@linaro.org, neilb@suse.com,
ckeepax@opensource.wolfsonmicro.com,
patches@opensource.wolfsonmicro.com, baolin.wang@linaro.org,
linux-pm@vger.kernel.org, linux-usb@vger.kernel.org,
device-mainlining@lists.linuxfoundation.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v19 3/4] usb: gadget: Integrate with the usb gadget supporting for usb charger
Date: Mon, 20 Feb 2017 16:51:09 +0800 [thread overview]
Message-ID: <084edac2d7732525d8dc437f6adbd7867377100c.1487578977.git.baolin.wang@linaro.org> (raw)
In-Reply-To: <cover.1487578977.git.baolin.wang@linaro.org>
In-Reply-To: <cover.1487578977.git.baolin.wang@linaro.org>
When the usb gadget supporting for usb charger is ready, the usb charger
can implement the usb_charger_plug_by_gadget() function, usb_charger_exit()
function and dev_to_uchger() function by getting 'struct usb_charger' from
'struct gadget'.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Reviewed-by: Li Jun <jun.li@nxp.com>
Tested-by: Li Jun <jun.li@nxp.com>
---
drivers/usb/gadget/udc/charger.c | 97 +++++++++++++++++++++++++++++++++++++-
1 file changed, 96 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/udc/charger.c b/drivers/usb/gadget/udc/charger.c
index 6d62f54..19eb044 100644
--- a/drivers/usb/gadget/udc/charger.c
+++ b/drivers/usb/gadget/udc/charger.c
@@ -38,7 +38,9 @@
static struct usb_charger *dev_to_uchger(struct device *dev)
{
- return NULL;
+ struct usb_gadget *gadget = container_of(dev, struct usb_gadget, dev);
+
+ return gadget->charger;
}
/*
@@ -398,6 +400,18 @@ static int __usb_charger_set_cur_limit_by_type(struct usb_charger *uchger,
int usb_charger_set_cur_limit_by_gadget(struct usb_gadget *gadget,
unsigned int cur_limit)
{
+ struct usb_charger *uchger = gadget->charger;
+ int ret;
+
+ if (!uchger)
+ return -EINVAL;
+
+ ret = __usb_charger_set_cur_limit_by_type(uchger, uchger->type,
+ cur_limit);
+ if (ret)
+ return ret;
+
+ schedule_work(&uchger->work);
return 0;
}
EXPORT_SYMBOL_GPL(usb_charger_set_cur_limit_by_gadget);
@@ -622,11 +636,66 @@ static int usb_charger_plug_by_extcon(struct notifier_block *nb,
int usb_charger_plug_by_gadget(struct usb_gadget *gadget,
unsigned long state)
{
+ struct usb_charger *uchger = gadget->charger;
+ enum usb_charger_state uchger_state;
+
+ if (WARN(!uchger, "charger can not be NULL"))
+ return -EINVAL;
+
+ /*
+ * Report event to power to setting the current limitation
+ * for this usb charger when one usb charger state is changed
+ * with detecting by usb gadget state.
+ */
+ if (uchger->old_gadget_state != state) {
+ uchger->old_gadget_state = state;
+
+ if (state >= USB_STATE_ATTACHED) {
+ uchger_state = USB_CHARGER_PRESENT;
+ } else if (state == USB_STATE_NOTATTACHED) {
+ mutex_lock(&uchger->lock);
+
+ /*
+ * Need check the charger type to make sure the usb
+ * cable is removed, in case it just changes the usb
+ * function with configfs.
+ */
+ if (uchger->type != UNKNOWN_TYPE) {
+ mutex_unlock(&uchger->lock);
+ return 0;
+ }
+
+ mutex_unlock(&uchger->lock);
+ uchger_state = USB_CHARGER_ABSENT;
+ } else {
+ uchger_state = USB_CHARGER_DEFAULT;
+ }
+
+ usb_charger_notify_state(uchger, uchger_state);
+ }
+
return 0;
}
EXPORT_SYMBOL_GPL(usb_charger_plug_by_gadget);
/*
+ * usb_charger_unregister() - Unregister a usb charger.
+ * @uchger - the usb charger to be unregistered.
+ */
+static int usb_charger_unregister(struct usb_charger *uchger)
+{
+ ida_simple_remove(&usb_charger_ida, uchger->id);
+ sysfs_remove_groups(&uchger->gadget->dev.kobj, usb_charger_groups);
+ uchger->id = -1;
+
+ mutex_lock(&charger_lock);
+ list_del(&uchger->list);
+ mutex_unlock(&charger_lock);
+
+ return 0;
+}
+
+/*
* usb_charger_register() - Register a new usb charger.
* @uchger - the new usb charger instance.
*/
@@ -725,6 +794,7 @@ int usb_charger_init(struct usb_gadget *ugadget)
}
uchger->gadget = ugadget;
+ ugadget->charger = uchger;
uchger->old_gadget_state = USB_STATE_NOTATTACHED;
/* Register a new usb charger */
@@ -762,6 +832,31 @@ int usb_charger_init(struct usb_gadget *ugadget)
int usb_charger_exit(struct usb_gadget *ugadget)
{
+ struct usb_charger *uchger = ugadget->charger;
+
+ if (!uchger)
+ return -EINVAL;
+
+ usb_charger_unregister(uchger);
+ ugadget->charger = NULL;
+
+ extcon_unregister_notifier(uchger->extcon_dev,
+ EXTCON_USB,
+ &uchger->extcon_nb.nb);
+ extcon_unregister_notifier(uchger->extcon_dev,
+ EXTCON_CHG_USB_SDP,
+ &uchger->extcon_type_nb.nb);
+ extcon_unregister_notifier(uchger->extcon_dev,
+ EXTCON_CHG_USB_CDP,
+ &uchger->extcon_type_nb.nb);
+ extcon_unregister_notifier(uchger->extcon_dev,
+ EXTCON_CHG_USB_DCP,
+ &uchger->extcon_type_nb.nb);
+ extcon_unregister_notifier(uchger->extcon_dev,
+ EXTCON_CHG_USB_ACA,
+ &uchger->extcon_type_nb.nb);
+
+ kfree(uchger);
return 0;
}
--
1.7.9.5
next prev parent reply other threads:[~2017-02-20 8:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-20 8:51 [PATCH v19 0/4] Introduce usb charger framework to deal with the usb gadget power negotation Baolin Wang
2017-02-20 8:51 ` [PATCH v19 1/4] usb: gadget: Introduce the usb charger framework Baolin Wang
2017-02-20 8:51 ` [PATCH v19 2/4] usb: gadget: Support for " Baolin Wang
2017-02-20 10:08 ` kbuild test robot
2017-02-20 10:18 ` Baolin Wang
2017-02-20 8:51 ` Baolin Wang [this message]
2017-02-20 8:51 ` [PATCH v19 4/4] power: wm831x_power: Support USB charger current limit management Baolin Wang
2017-02-20 10:20 ` kbuild test robot
2017-03-03 2:23 ` [PATCH v19 0/4] Introduce usb charger framework to deal with the usb gadget power negotation NeilBrown
2017-03-07 9:38 ` Baolin Wang
2017-03-09 1:50 ` Jun Li
2017-03-09 6:10 ` Baolin Wang
2017-03-09 10:34 ` Jun Li
2017-03-09 11:22 ` Baolin Wang
2017-03-10 6:30 ` Jun Li
2017-03-10 7:15 ` Baolin Wang
2017-03-10 8:27 ` Jun Li
2017-03-10 10:52 ` Baolin Wang
2017-03-13 1:09 ` Jun Li
2017-03-13 8:43 ` Baolin Wang
2017-03-14 1:10 ` Jun Li
2017-03-14 2:03 ` Baolin Wang
2017-03-28 23:04 ` NeilBrown
2017-03-30 3:16 ` Baolin Wang
2017-03-14 9:57 ` Lee Jones
2017-03-14 10:39 ` Baolin Wang
2017-03-14 12:14 ` Lee Jones
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=084edac2d7732525d8dc437f6adbd7867377100c.1487578977.git.baolin.wang@linaro.org \
--to=baolin.wang@linaro.org \
--cc=balbi@kernel.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=dbaryshkov@gmail.com \
--cc=device-mainlining@lists.linuxfoundation.org \
--cc=dwmw2@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=grygorii.strashko@ti.com \
--cc=john.stultz@linaro.org \
--cc=jun.li@nxp.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=neilb@suse.com \
--cc=patches@opensource.wolfsonmicro.com \
--cc=peter.chen@freescale.com \
--cc=robh@kernel.org \
--cc=ruslan.bilovol@gmail.com \
--cc=sre@kernel.org \
--cc=stern@rowland.harvard.edu \
--cc=yoshihiro.shimoda.uh@renesas.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).