From: Robert Baldyga <r.baldyga@samsung.com>
To: gregkh@linuxfoundation.org, balbi@ti.com
Cc: Peter.Chen@freescale.com, johnyoun@synopsys.com,
dahlmann.thomas@arcor.de, nicolas.ferre@atmel.com,
cernekee@gmail.com, leoli@freescale.com, daniel@zonque.org,
haojian.zhuang@gmail.com, robert.jarzmik@free.fr,
michal.simek@xilinx.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
linux-omap@vger.kernel.org, linux-geode@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, andrzej.p@samsung.com,
m.szyprowski@samsung.com, Robert Baldyga <r.baldyga@samsung.com>
Subject: [PATCH v3 46/46] usb: musb: gadget: add musb_match_ep() function
Date: Wed, 15 Jul 2015 08:32:33 +0200 [thread overview]
Message-ID: <1436941953-1327-47-git-send-email-r.baldyga@samsung.com> (raw)
In-Reply-To: <1436941953-1327-1-git-send-email-r.baldyga@samsung.com>
Add 'match_ep' callback to utilize chip-specific knowledge in endpoint matching
process. Function does the same that was done by chip-specific code inside
of epautoconf. Now this code can be removed from there to separate generic code
from platform specific logic.
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
drivers/usb/gadget/epautoconf.c | 23 -----------------------
drivers/usb/musb/musb_gadget.c | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index da45371..254ece7 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -83,29 +83,6 @@ struct usb_ep *usb_ep_autoconfig_ss(
goto found_ep;
}
- /* First, apply chip-specific "best usage" knowledge.
- * This might make a good usb_gadget_ops hook ...
- */
-#ifdef CONFIG_BLACKFIN
- if (gadget_is_musbhdrc(gadget)) {
- if ((USB_ENDPOINT_XFER_BULK == type) ||
- (USB_ENDPOINT_XFER_ISOC == type)) {
- if (USB_DIR_IN & desc->bEndpointAddress)
- ep = gadget_find_ep_by_name(gadget, "ep5in");
- else
- ep = gadget_find_ep_by_name(gadget, "ep6out");
- } else if (USB_ENDPOINT_XFER_INT == type) {
- if (USB_DIR_IN & desc->bEndpointAddress)
- ep = gadget_find_ep_by_name(gadget, "ep1in");
- else
- ep = gadget_find_ep_by_name(gadget, "ep2out");
- } else
- ep = NULL;
- if (ep && usb_gadget_ep_match_desc(gadget, ep, desc, ep_comp))
- goto found_ep;
- }
-#endif
-
/* Second, look at endpoints until an unclaimed one looks usable */
list_for_each_entry (ep, &gadget->ep_list, ep_list) {
if (usb_gadget_ep_match_desc(gadget, ep, desc, ep_comp))
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 043248a..3a64cf2 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1684,6 +1684,39 @@ static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on)
return 0;
}
+#ifdef CONFIG_BLACKFIN
+static struct usb_ep *musb_match_ep(struct usb_gadget *g,
+ struct usb_endpoint_descriptor *desc,
+ struct usb_ss_ep_comp_descriptor *ep_comp)
+{
+ struct usb_ep *ep = NULL;
+ u8 type = usb_endpoint_type(desc);
+
+ switch(type) {
+ case USB_ENDPOINT_XFER_ISOC:
+ case USB_ENDPOINT_XFER_BULK:
+ if (usb_endpoint_dir_in(desc))
+ ep = gadget_find_ep_by_name(g, "ep5in");
+ else
+ ep = gadget_find_ep_by_name(g, "ep6out");
+ break;
+ case USB_ENDPOINT_XFER_INT:
+ if (usb_endpoint_dir_in(desc))
+ ep = gadget_find_ep_by_name(g, "ep1in");
+ else
+ ep = gadget_find_ep_by_name(g, "ep2out");
+ default:
+ }
+
+ if (ep && usb_gadget_ep_match_desc(g, ep, desc, ep_comp))
+ return ep;
+
+ return NULL;
+}
+#else
+#define musb_match_ep NULL
+#endif
+
static int musb_gadget_start(struct usb_gadget *g,
struct usb_gadget_driver *driver);
static int musb_gadget_stop(struct usb_gadget *g);
@@ -1697,6 +1730,7 @@ static const struct usb_gadget_ops musb_gadget_operations = {
.pullup = musb_gadget_pullup,
.udc_start = musb_gadget_start,
.udc_stop = musb_gadget_stop,
+ .match_ep = musb_match_ep,
};
/* ----------------------------------------------------------------------- */
--
1.9.1
prev parent reply other threads:[~2015-07-15 6:38 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 6:31 [PATCH v3 00/46] usb: gadget: rework ep matching and claiming mechanism Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 01/46] usb: gadget: encapsulate endpoint " Robert Baldyga
2015-07-20 14:43 ` Krzysztof Opasiak
2015-07-15 6:31 ` [PATCH v3 02/46] usb: gadget: add endpoint capabilities flags Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 03/46] usb: gadget: add endpoint capabilities helper macros Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 04/46] staging: emxx_udc: add ep capabilities support Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 05/46] usb: chipidea: udc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 06/46] usb: dwc2: gadget: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 07/46] usb: dwc3: " Robert Baldyga
2015-07-21 16:43 ` Felipe Balbi
2015-07-15 6:31 ` [PATCH v3 08/46] usb: gadget: amd5536udc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 09/46] usb: gadget: at91_udc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 10/46] usb: gadget: bcm63xx_udc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 11/46] usb: gadget: bdc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 12/46] usb: gadget: dummy-hcd: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 13/46] usb: gadget: fotg210-udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 14/46] usb: gadget: fsl_qe_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 15/46] usb: gadget: fsl_udc_core: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 16/46] usb: gadget: fusb300_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 17/46] usb: gadget: goku_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 18/46] usb: gadget: gr_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 19/46] usb: gadget: lpc32xx_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 20/46] usb: gadget: m66592-udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 21/46] usb: gadget: mv_u3d_core: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 22/46] usb: gadget: mv_udc_core: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 23/46] usb: gadget: net2272: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 24/46] usb: gadget: net2280: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 25/46] usb: gadget: omap_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 26/46] usb: gadget: pch_ud: " Robert Baldyga
2015-07-20 15:08 ` Krzysztof Opasiak
2015-07-25 9:34 ` Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 27/46] usb: gadget: pxa25x_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 28/46] usb: gadget: pxa27x_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 29/46] usb: gadget: r8a66597-udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 30/46] usb: gadget: s3c-hsudc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 31/46] usb: gadget: s3c2410_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 32/46] usb: gadget: udc-xilinx: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 33/46] usb: isp1760: udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 34/46] usb: musb: gadget: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 35/46] usb: renesas: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 36/46] usb: gadget: atmel_usba_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 37/46] usb: gadget: epautoconf: add endpoint capabilities flags verification Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 38/46] usb: gadget: epautoconf: remove pxa quirk from ep_matches() Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 39/46] usb: gadget: epautoconf: remove ep and desc configuration " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 40/46] usb: gadget: epautoconf: rework ep_matches() function Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 41/46] usb: gadget: add 'ep_match' callback to usb_gadget_ops Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 42/46] usb: gadget: move ep_matches() from epautoconf to udc-core Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 43/46] usb: gadget: move find_ep() from epautoconf to gadget.h Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 44/46] usb: gadget: net2280: add net2280_match_ep() function Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 45/46] usb: gadget: goku_udc: add goku_match_ep() function Robert Baldyga
2015-07-15 6:32 ` Robert Baldyga [this message]
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=1436941953-1327-47-git-send-email-r.baldyga@samsung.com \
--to=r.baldyga@samsung.com \
--cc=Peter.Chen@freescale.com \
--cc=andrzej.p@samsung.com \
--cc=balbi@ti.com \
--cc=cernekee@gmail.com \
--cc=dahlmann.thomas@arcor.de \
--cc=daniel@zonque.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=johnyoun@synopsys.com \
--cc=leoli@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-geode@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=m.szyprowski@samsung.com \
--cc=michal.simek@xilinx.com \
--cc=nicolas.ferre@atmel.com \
--cc=robert.jarzmik@free.fr \
/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).