From: Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
balbi-l0cyMroinI0@public.gmane.org,
peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
pawel.moll-5wv7dgnIgG8@public.gmane.org,
mark.rutland-5wv7dgnIgG8@public.gmane.org,
macpaul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
rogerq-l0cyMroinI0@public.gmane.org,
Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Subject: [PATCH v5 14/23] usb: gadget: audio: allocate and init otg descriptor by otg capabilities
Date: Wed, 17 Jun 2015 19:40:21 +0800 [thread overview]
Message-ID: <1434541230-15090-15-git-send-email-jun.li@freescale.com> (raw)
In-Reply-To: <1434541230-15090-1-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Allocate and initialize usb otg descriptor according to gadget otg
capabilities, add it for each usb configurations. If otg capability
is not defined, keep its original otg descriptor unchanged.
Signed-off-by: Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
drivers/usb/gadget/legacy/audio.c | 43 +++++++++++++++++++++------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c
index f289caf..cf2bdaf 100644
--- a/drivers/usb/gadget/legacy/audio.c
+++ b/drivers/usb/gadget/legacy/audio.c
@@ -150,20 +150,7 @@ static struct usb_device_descriptor device_desc = {
.bNumConfigurations = 1,
};
-static struct usb_otg_descriptor otg_descriptor = {
- .bLength = sizeof otg_descriptor,
- .bDescriptorType = USB_DT_OTG,
-
- /* REVISIT SRP-only hardware is possible, although
- * it would not be called "OTG" ...
- */
- .bmAttributes = USB_OTG_SRP | USB_OTG_HNP,
-};
-
-static const struct usb_descriptor_header *otg_desc[] = {
- (struct usb_descriptor_header *) &otg_descriptor,
- NULL,
-};
+static const struct usb_descriptor_header *otg_desc[2];
/*-------------------------------------------------------------------------*/
@@ -173,11 +160,6 @@ static int audio_do_config(struct usb_configuration *c)
/* FIXME alloc iConfiguration string, set it in c->strings */
- if (gadget_is_otg(c->cdev->gadget)) {
- c->descriptors = otg_desc;
- c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
- }
-
#ifdef CONFIG_GADGET_UAC1
f_uac1 = usb_get_function(fi_uac1);
if (IS_ERR(f_uac1)) {
@@ -259,14 +241,32 @@ static int audio_bind(struct usb_composite_dev *cdev)
device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;
device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;
+ if (gadget_is_otg(cdev->gadget)) {
+ if (!otg_desc[0]) {
+ struct usb_descriptor_header *usb_desc;
+
+ usb_desc = usb_otg_descriptor_alloc(cdev->gadget);
+ if (!usb_desc)
+ goto fail;
+ usb_otg_descriptor_init(cdev->gadget, usb_desc);
+ otg_desc[0] = usb_desc;
+ otg_desc[1] = NULL;
+ }
+ audio_config_driver.descriptors = otg_desc;
+ audio_config_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+ }
+
status = usb_add_config(cdev, &audio_config_driver, audio_do_config);
if (status < 0)
- goto fail;
+ goto fail_otg_desc;
usb_composite_overwrite_options(cdev, &coverwrite);
INFO(cdev, "%s, version: %s\n", DRIVER_DESC, DRIVER_VERSION);
return 0;
+fail_otg_desc:
+ kfree(otg_desc[0]);
+ otg_desc[0] = NULL;
fail:
#ifndef CONFIG_GADGET_UAC1
usb_put_function_instance(fi_uac2);
@@ -289,6 +289,9 @@ static int audio_unbind(struct usb_composite_dev *cdev)
if (!IS_ERR_OR_NULL(fi_uac2))
usb_put_function_instance(fi_uac2);
#endif
+ kfree(otg_desc[0]);
+ otg_desc[0] = NULL;
+
return 0;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-06-17 11:40 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 11:40 [PATCH v5 00/23] usb gadget update for OTG 2.0 Li Jun
[not found] ` <1434541230-15090-1-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-17 11:40 ` [PATCH v5 01/23] usb: add usb_otg20_descriptor for OTG 2.0 and above Li Jun
2015-06-17 11:40 ` [PATCH v5 02/23] usb: add USB_OTG_ADP definition Li Jun
2015-06-17 11:40 ` [PATCH v5 03/23] usb: otg: add usb_otg_caps structure for otg capabilities Li Jun
2015-06-17 11:40 ` [PATCH v5 04/23] usb: add usb_otg_caps to usb_gadget structure Li Jun
2015-06-17 11:40 ` [PATCH v5 05/23] usb: gadget: composite: add USB_DT_OTG request handling Li Jun
2015-06-17 11:40 ` [PATCH v5 06/23] doc: dt-binding: usb: add otg related properties Li Jun
2015-06-17 11:40 ` [PATCH v5 07/23] usb: common: add API to set usb otg capabilities by device tree Li Jun
2015-06-17 11:40 ` [PATCH v5 08/23] usb: chipidea: set usb gadeget's otg capabilities Li Jun
[not found] ` <1434541230-15090-9-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-18 7:39 ` Roger Quadros
[not found] ` <20150618103935.cfbd94c8c37c5c3298c55272-l0cyMroinI0@public.gmane.org>
2015-06-18 8:20 ` Li Jun
2015-06-18 12:06 ` Roger Quadros
[not found] ` <20150618150627.d7e81ca1d6bdf7dba94c4eff-l0cyMroinI0@public.gmane.org>
2015-06-18 13:10 ` Li Jun
2015-06-24 3:04 ` Peter Chen
2015-06-24 3:34 ` Li Jun
2015-06-24 3:49 ` Peter Chen
2015-06-24 7:22 ` Li Jun
2015-06-24 7:44 ` Peter Chen
2015-06-17 11:40 ` [PATCH v5 09/23] usb: chipidea: update ci_otg_is_fsm_mode conditions Li Jun
2015-06-17 11:40 ` [PATCH v5 10/23] usb: gadget: add usb otg descriptor allocate and init interface Li Jun
2015-06-17 11:40 ` [PATCH v5 11/23] usb: gadget: configfs: allocate and init otg descriptor by otg capabilities Li Jun
2015-06-17 11:40 ` [PATCH v5 12/23] usb: gadget: ether: " Li Jun
[not found] ` <1434541230-15090-13-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-18 7:43 ` Roger Quadros
[not found] ` <20150618104302.3da49bc854834b0257e3f703-l0cyMroinI0@public.gmane.org>
2015-06-18 7:51 ` Roger Quadros
[not found] ` <20150618105148.cbf486831982d0244d499461-l0cyMroinI0@public.gmane.org>
2015-06-18 8:30 ` Li Jun
2015-06-17 11:40 ` [PATCH v5 13/23] usb: gadget: acm_ms: " Li Jun
2015-06-17 11:40 ` Li Jun [this message]
2015-06-17 11:40 ` [PATCH v5 15/23] usb: gadget: cdc2: " Li Jun
2015-06-17 11:40 ` [PATCH v5 16/23] usb: gadget: g_ffs: " Li Jun
2015-06-17 11:40 ` [PATCH v5 17/23] usb: gadget: hid: " Li Jun
2015-06-17 11:40 ` [PATCH v5 18/23] usb: gadget: mass_storage: " Li Jun
2015-06-17 11:40 ` [PATCH v5 19/23] usb: gadget: multi: " Li Jun
2015-06-17 11:40 ` [PATCH v5 20/23] usb: gadget: ncm: " Li Jun
2015-06-17 11:40 ` [PATCH v5 21/23] usb: gadget: printer: " Li Jun
2015-06-17 11:40 ` [PATCH v5 22/23] usb: gadget: serial: " Li Jun
2015-06-17 11:40 ` [PATCH v5 23/23] usb: gadget: zero: " Li Jun
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=1434541230-15090-15-git-send-email-jun.li@freescale.com \
--to=jun.li-kzfg59tc24xl57midrcfdg@public.gmane.org \
--cc=balbi-l0cyMroinI0@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=macpaul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=pawel.moll-5wv7dgnIgG8@public.gmane.org \
--cc=peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=rogerq-l0cyMroinI0@public.gmane.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.