[<prev] [next>] [day] [month] [year] [list]
Message-Id: <bfe20506d43f2307ee79f65f2d7bcadc56201abc.1440135007.git.baolin.wang@linaro.org>
Date: Fri, 21 Aug 2015 13:34:50 +0800
From: Baolin Wang <baolin.wang@...aro.org>
To: balbi@...com
Cc: broonie@...nel.org, linus.walleij@...aro.org,
linux-kernel@...r.kernel.org, baolin.wang@...aro.org,
gregkh@...uxfoundation.org, peter.chen@...escale.com,
sojka@...ica.cz, stern@...land.harvard.edu, r.baldyga@...sung.com,
yoshihiro.shimoda.uh@...esas.com, linux-usb@...r.kernel.org,
device-mainlining@...ts.linuxfoundation.org, sre@...nel.org,
dbaryshkov@...il.com, dwmw2@...radead.org, sameo@...ux.intel.com,
lee.jones@...aro.org, patches@...nsource.wolfsonmicro.com,
linux-pm@...r.kernel.org
Subject: [PATCH v4 3/5] gadget: Support for the usb charger framework
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@...aro.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.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists