Merge tag 'pinctrl-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[mirror_ubuntu-bionic-kernel.git] / drivers / usb / gadget / f_serial.c

diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c
index cf33a8d0fd5df46ec339f5b481b68dc61121243a..07197d63d9b1d056e75c79cd85261059279715fa 100644 (file)
--- a/drivers/usb/gadget/f_serial.c
+++ b/drivers/usb/gadget/f_serial.c
@@ -99,6 +99,34 @@ static struct usb_descriptor_header *gser_hs_function[] __initdata = {
        NULL,
 };
 
+static struct usb_endpoint_descriptor gser_ss_in_desc __initdata = {
+       .bLength =              USB_DT_ENDPOINT_SIZE,
+       .bDescriptorType =      USB_DT_ENDPOINT,
+       .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+       .wMaxPacketSize =       cpu_to_le16(1024),
+};
+
+static struct usb_endpoint_descriptor gser_ss_out_desc __initdata = {
+       .bLength =              USB_DT_ENDPOINT_SIZE,
+       .bDescriptorType =      USB_DT_ENDPOINT,
+       .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+       .wMaxPacketSize =       cpu_to_le16(1024),
+};
+
+static struct usb_ss_ep_comp_descriptor gser_ss_bulk_comp_desc __initdata = {
+       .bLength =              sizeof gser_ss_bulk_comp_desc,
+       .bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,
+};
+
+static struct usb_descriptor_header *gser_ss_function[] __initdata = {
+       (struct usb_descriptor_header *) &gser_interface_desc,
+       (struct usb_descriptor_header *) &gser_ss_in_desc,
+       (struct usb_descriptor_header *) &gser_ss_bulk_comp_desc,
+       (struct usb_descriptor_header *) &gser_ss_out_desc,
+       (struct usb_descriptor_header *) &gser_ss_bulk_comp_desc,
+       NULL,
+};
+
 /* string descriptors: */
 
 static struct usb_string gser_string_defs[] = {
@@ -201,9 +229,21 @@ gser_bind(struct usb_configuration *c, struct usb_function *f)
                /* copy descriptors, and track endpoint copies */
                f->hs_descriptors = usb_copy_descriptors(gser_hs_function);
        }
+       if (gadget_is_superspeed(c->cdev->gadget)) {
+               gser_ss_in_desc.bEndpointAddress =
+                       gser_fs_in_desc.bEndpointAddress;
+               gser_ss_out_desc.bEndpointAddress =
+                       gser_fs_out_desc.bEndpointAddress;
+
+               /* copy descriptors, and track endpoint copies */
+               f->ss_descriptors = usb_copy_descriptors(gser_ss_function);
+               if (!f->ss_descriptors)
+                       goto fail;
+       }
 
        DBG(cdev, "generic ttyGS%d: %s speed IN/%s OUT/%s\n",
                        gser->port_num,
+                       gadget_is_superspeed(c->cdev->gadget) ? "super" :
                        gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
                        gser->port.in->name, gser->port.out->name);
        return 0;
@@ -225,6 +265,8 @@ gser_unbind(struct usb_configuration *c, struct usb_function *f)
 {
        if (gadget_is_dualspeed(c->cdev->gadget))
                usb_free_descriptors(f->hs_descriptors);
+       if (gadget_is_superspeed(c->cdev->gadget))
+               usb_free_descriptors(f->ss_descriptors);
        usb_free_descriptors(f->descriptors);
        kfree(func_to_gser(f));
 }