V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fastboot: Enable the respective speed endpoints at runtime 

In a dual speed configuration we need to check at runtime if
we want to enable the Full-Speed or High-Speed endpoint.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Steve Rae <srae@broadcom.com>
[Test HW: bcm235xx board]
This commit is contained in:
Roger Quadros 2016-04-13 11:30:00 +03:00 committed by Marek Vasut
parent 718156ad0a
commit 8b704a0e3d
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/gadget/f_fastboot.c
View File

@ -115,6 +115,15 @@ static struct usb_descriptor_header *fb_hs_function[] = {
NULL, NULL,
}; };
static struct usb_endpoint_descriptor *
fb_ep_desc(struct usb_gadget *g, struct usb_endpoint_descriptor *fs,
struct usb_endpoint_descriptor *hs)
{
if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
return hs;
return fs;
}
/* /*
* static strings, in UTF-8 * static strings, in UTF-8
*/ */
@ -255,18 +264,18 @@ static int fastboot_set_alt(struct usb_function *f,
struct usb_composite_dev *cdev = f->config->cdev; struct usb_composite_dev *cdev = f->config->cdev;
struct usb_gadget *gadget = cdev->gadget; struct usb_gadget *gadget = cdev->gadget;
struct f_fastboot *f_fb = func_to_fastboot(f); struct f_fastboot *f_fb = func_to_fastboot(f);
const struct usb_endpoint_descriptor *d;
debug("%s: func: %s intf: %d alt: %d\n", debug("%s: func: %s intf: %d alt: %d\n",
__func__, f->name, interface, alt); __func__, f->name, interface, alt);
/* make sure we don't enable the ep twice */ if (gadget->speed == USB_SPEED_HIGH)
if (gadget->speed == USB_SPEED_HIGH) {
ret = usb_ep_enable(f_fb->out_ep, &hs_ep_out);
is_high_speed = true; is_high_speed = true;
} else { else
ret = usb_ep_enable(f_fb->out_ep, &fs_ep_out);
is_high_speed = false; is_high_speed = false;
}
d = fb_ep_desc(gadget, &fs_ep_out, &hs_ep_out);
ret = usb_ep_enable(f_fb->out_ep, d);
if (ret) { if (ret) {
puts("failed to enable out ep\n"); puts("failed to enable out ep\n");
return ret; return ret;
@ -280,7 +289,8 @@ static int fastboot_set_alt(struct usb_function *f,
} }
f_fb->out_req->complete = rx_handler_command; f_fb->out_req->complete = rx_handler_command;
ret = usb_ep_enable(f_fb->in_ep, &fs_ep_in); d = fb_ep_desc(gadget, &fs_ep_in, &hs_ep_in);
ret = usb_ep_enable(f_fb->in_ep, d);
if (ret) { if (ret) {
puts("failed to enable in ep\n"); puts("failed to enable in ep\n");
goto err; goto err;