mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Baolin Wang <baolin.wang@linaro.org>
To: balbi@ti.com, sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org
Cc: gregkh@linuxfoundation.org, peter.chen@freescale.com,
	stern@rowland.harvard.edu, r.baldyga@samsung.com,
	sojka@merica.cz, yoshihiro.shimoda.uh@renesas.com,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
	sameo@linux.intel.com, lee.jones@linaro.org,
	ckeepax@opensource.wolfsonmicro.com, broonie@kernel.org,
	patches@opensource.wolfsonmicro.com, linux-pm@vger.kernel.org,
	device-mainlining@lists.linuxfoundation.org,
	baolin.wang@linaro.org
Subject: [PATCH v4 3/5] gadget: Support for the usb charger framework
Date: Thu, 24 Sep 2015 10:39:25 -0700	[thread overview]
Message-ID: <7ee4199f14eb9e84c8ea8d66568e0d4dde193583.1443057232.git.baolin.wang@linaro.org> (raw)
In-Reply-To: <cover.1443057229.git.baolin.wang@linaro.org>
In-Reply-To: <cover.1443057229.git.baolin.wang@linaro.org>

For supporting the usb charger, it adds the usb_charger_init() and
usb_charger_exit() functions for usb charger initialization and exit.

Introduce a callback 'get_charger_type' which will implemented by
user for usb gadget operations to get the usb charger type.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/usb/gadget/udc/udc-core.c | 8 ++++++++
 include/linux/usb/gadget.h        | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 4238fc3..370376e 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -28,6 +28,7 @@
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb.h>
+#include <linux/usb/usb_charger.h>
 
 /**
  * struct usb_udc - describes one usb device controller
@@ -437,8 +438,14 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
 
 	mutex_unlock(&udc_lock);
 
+	ret = usb_charger_init(gadget);
+	if (ret)
+		goto err5;
+
 	return 0;
 
+err5:
+	device_del(&udc->dev);
 err4:
 	list_del(&udc->list);
 	mutex_unlock(&udc_lock);
@@ -513,6 +520,7 @@ void usb_del_gadget_udc(struct usb_gadget *gadget)
 	kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE);
 	flush_work(&gadget->work);
 	device_unregister(&udc->dev);
+	usb_charger_exit(gadget);
 	device_unregister(&gadget->dev);
 }
 EXPORT_SYMBOL_GPL(usb_del_gadget_udc);
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 755e8bc..451ad32 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -537,6 +537,7 @@ struct usb_gadget_ops {
 	struct usb_ep *(*match_ep)(struct usb_gadget *,
 			struct usb_endpoint_descriptor *,
 			struct usb_ss_ep_comp_descriptor *);
+	enum usb_charger_type (*get_charger_type)(struct usb_gadget *);
 };
 
 /**
@@ -611,6 +612,7 @@ struct usb_gadget {
 	struct usb_otg_caps		*otg_caps;
 	struct raw_notifier_head	nh;
 	struct mutex			lock;
+	struct usb_charger		*charger;
 
 	unsigned			sg_supported:1;
 	unsigned			is_otg:1;
-- 
1.9.1


  parent reply	other threads:[~2015-09-24 17:40 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-24 17:39 [PATCH v4 0/5] Introduce usb charger framework to deal with the usb gadget power negotation Baolin Wang
2015-09-24 17:39 ` [PATCH v4 1/5] gadget: Introduce the notifier functions Baolin Wang
2015-10-01 17:29   ` Felipe Balbi
2015-10-01 17:43     ` Mark Brown
2015-10-01 17:58       ` Felipe Balbi
2015-10-01 18:01         ` Felipe Balbi
2015-10-02 16:47         ` Mark Brown
2015-10-02 17:23           ` Felipe Balbi
2015-10-02 18:49             ` Mark Brown
2015-10-02 19:11               ` Felipe Balbi
2015-10-04 22:55                 ` Mark Brown
2015-10-05 15:15                   ` Felipe Balbi
2015-10-05 16:18                     ` Mark Brown
2015-10-05 16:29                       ` Felipe Balbi
2015-10-07 16:44             ` [Device-mainlining] " Bjorn Andersson
2015-10-08 15:51         ` Pavel Machek
2015-10-02  5:41     ` Greg KH
2015-10-02 17:27       ` Felipe Balbi
2015-10-08 15:50     ` Pavel Machek
2015-10-09 21:17       ` Felipe Balbi
2015-10-12 16:56         ` Mark Brown
2016-04-09 16:01         ` Pavel Machek
2015-09-24 17:39 ` [PATCH v4 2/5] gadget: Introduce the usb charger framework Baolin Wang
2015-09-24 17:39 ` Baolin Wang [this message]
2015-09-24 17:39 ` [PATCH v4 4/5] gadget: Integrate with the usb gadget supporting for usb charger Baolin Wang
2015-09-24 17:39 ` [PATCH v4 5/5] power: wm831x_power: Support USB charger current limit management Baolin Wang
     [not found] <cover.1440135007.git.baolin.wang@linaro.org>
2015-08-21  5:34 ` [PATCH v4 3/5] gadget: Support for the usb charger framework Baolin Wang
  -- strict thread matches above, loose matches on Subject: below --
2015-08-19  9:13 [PATCH v4 0/5] Introduce usb charger framework to deal with the usb gadget power negotation Baolin Wang
2015-08-19  9:13 ` [PATCH v4 3/5] gadget: Support for the usb charger framework Baolin Wang
2015-08-19 12:56   ` Sergei Shtylyov
2015-08-20  1:42     ` Baolin Wang

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=7ee4199f14eb9e84c8ea8d66568e0d4dde193583.1443057232.git.baolin.wang@linaro.org \
    --to=baolin.wang@linaro.org \
    --cc=balbi@ti.com \
    --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=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=patches@opensource.wolfsonmicro.com \
    --cc=peter.chen@freescale.com \
    --cc=r.baldyga@samsung.com \
    --cc=sameo@linux.intel.com \
    --cc=sojka@merica.cz \
    --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

all inboxes | Powered by JetHome®