23 files changed, 3283 insertions, 691 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index bddc8fd9a7be..5e242c34088d 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -321,6 +321,15 @@ config USB_MV_UDC
           USB2.0 OTG controller, which can be configured as high speed or
           full speed USB peripheral.
 
+config USB_MV_U3D
+        tristate "MARVELL PXA2128 USB 3.0 controller"
+        depends on CPU_MMP3
+        select USB_GADGET_DUALSPEED
+        select USB_GADGET_SUPERSPEED
+        help
+          MARVELL PXA2128 Processor series include a super speed USB3.0 device
+          controller, which support super speed USB peripheral.
+
 #
 # Controllers available in both integrated and discrete versions
 #
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 1811513f1c27..3fd8cd09d2c1 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_USB_EG20T)		+= pch_udc.o
 obj-$(CONFIG_USB_MV_UDC)        += mv_udc.o
 mv_udc-y                        := mv_udc_core.o
 obj-$(CONFIG_USB_FUSB300)       += fusb300_udc.o
+obj-$(CONFIG_USB_MV_U3D)        += mv_u3d_core.o
 
 #
 # USB gadget drivers
diff --git a/drivers/usb/gadget/acm_ms.c b/drivers/usb/gadget/acm_ms.c
index fdb7aec3bd0c..75b8a691fd00 100644
--- a/drivers/usb/gadget/acm_ms.c
+++ b/drivers/usb/gadget/acm_ms.c
@@ -235,6 +235,7 @@ static int __exit acm_ms_unbind(struct usb_composite_dev *cdev)
 static struct usb_composite_driver acm_ms_driver = {
         .name           = "g_acm_ms",
         .dev            = &device_desc,
+        .max_speed      = USB_SPEED_SUPER,
         .strings        = dev_strings,
         .unbind         = __exit_p(acm_ms_unbind),
 };
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 1a4430f315c3..c9e66dfb02e6 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1634,6 +1634,7 @@ static int at91_start(struct usb_gadget *gadget,
         udc = container_of(gadget, struct at91_udc, gadget);
         udc->driver = driver;
         udc->gadget.dev.driver = &driver->driver;
+        udc->gadget.dev.of_node = udc->pdev->dev.of_node;
         dev_set_drvdata(&udc->gadget.dev, &driver->driver);
         udc->enabled = 1;
         udc->selfpowered = 1;
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 390749bbb0c3..3f72110da1b0 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -117,6 +117,7 @@ int config_ep_by_speed(struct usb_gadget *g,
                         struct usb_function *f,
                         struct usb_ep *_ep)
 {
+        struct usb_composite_dev        *cdev = get_gadget_data(g);
         struct usb_endpoint_descriptor *chosen_desc = NULL;
         struct usb_descriptor_header **speed_desc = NULL;
 
@@ -180,10 +181,12 @@ ep_found:
                         _ep->mult = comp_desc->bmAttributes & 0x3;
                 case USB_ENDPOINT_XFER_BULK:
                 case USB_ENDPOINT_XFER_INT:
-                        _ep->maxburst = comp_desc->bMaxBurst;
+                        _ep->maxburst = comp_desc->bMaxBurst + 1;
                         break;
                 default:
-                        /* Do nothing for control endpoints */
+                        if (comp_desc->bMaxBurst != 0)
+                                ERROR(cdev, "ep0 bMaxBurst must be 0\n");
+                        _ep->maxburst = 1;
                         break;
                 }
         }
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index dcd1c7fbb016..8adc79d1b402 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -21,6 +21,7 @@
 #include <linux/blkdev.h>
 #include <linux/pagemap.h>
 #include <linux/export.h>
+#include <linux/hid.h>
 #include <asm/unaligned.h>
 
 #include <linux/usb/composite.h>
@@ -1671,6 +1672,12 @@ static int __must_check ffs_do_desc(char *data, unsigned len,
         }
                 break;
 
+        case HID_DT_HID:
+                pr_vdebug("hid descriptor\n");
+                if (length != sizeof(struct hid_descriptor))
+                        goto inv_length;
+                break;
+
         case USB_DT_OTG:
                 if (length != sizeof(struct usb_otg_descriptor))
                         goto inv_length;
diff --git a/drivers/usb/gadget/f_hid.c b/drivers/usb/gadget/f_hid.c
index 3b3932c55361..16a8b1c15c62 100644
--- a/drivers/usb/gadget/f_hid.c
+++ b/drivers/usb/gadget/f_hid.c
@@ -26,6 +26,12 @@ static struct class *hidg_class;
 /*-------------------------------------------------------------------------*/
 /*                            HID gadget struct                            */
 
+struct f_hidg_req_list {
+        struct usb_request      *req;
+        unsigned int            pos;
+        struct list_head        list;
+};
+
 struct f_hidg {
         /* configuration */
         unsigned char                   bInterfaceSubClass;
@@ -35,10 +41,10 @@ struct f_hidg {
         unsigned short                  report_length;
 
         /* recv report */
-        char                            *set_report_buff;
-        unsigned short                  set_report_length;
+        struct list_head                completed_out_req;
         spinlock_t                      spinlock;
         wait_queue_head_t               read_queue;
+        unsigned int                    qlen;
 
         /* send report */
         struct mutex                    lock;
@@ -49,7 +55,9 @@ struct f_hidg {
         int                             minor;
         struct cdev                     cdev;
         struct usb_function             func;
+
         struct usb_ep                   *in_ep;
+        struct usb_ep                   *out_ep;
 };
 
 static inline struct f_hidg *func_to_hidg(struct usb_function *f)
@@ -65,7 +73,7 @@ static struct usb_interface_descriptor hidg_interface_desc = {
         .bDescriptorType        = USB_DT_INTERFACE,
         /* .bInterfaceNumber    = DYNAMIC */
         .bAlternateSetting      = 0,
-        .bNumEndpoints          = 1,
+        .bNumEndpoints          = 2,
         .bInterfaceClass        = USB_CLASS_HID,
         /* .bInterfaceSubClass  = DYNAMIC */
         /* .bInterfaceProtocol  = DYNAMIC */
@@ -96,10 +104,23 @@ static struct usb_endpoint_descriptor hidg_hs_in_ep_desc = {
                                       */
 };
 
+static struct usb_endpoint_descriptor hidg_hs_out_ep_desc = {
+        .bLength                = USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType        = USB_DT_ENDPOINT,
+        .bEndpointAddress       = USB_DIR_OUT,
+        .bmAttributes           = USB_ENDPOINT_XFER_INT,
+        /*.wMaxPacketSize       = DYNAMIC */
+        .bInterval              = 4, /* FIXME: Add this field in the
+                                      * HID gadget configuration?
+                                      * (struct hidg_func_descriptor)
+                                      */
+};
+
 static struct usb_descriptor_header *hidg_hs_descriptors[] = {
         (struct usb_descriptor_header *)&hidg_interface_desc,
         (struct usb_descriptor_header *)&hidg_desc,
         (struct usb_descriptor_header *)&hidg_hs_in_ep_desc,
+        (struct usb_descriptor_header *)&hidg_hs_out_ep_desc,
         NULL,
 };
 
@@ -117,10 +138,23 @@ static struct usb_endpoint_descriptor hidg_fs_in_ep_desc = {
                                        */
 };
 
+static struct usb_endpoint_descriptor hidg_fs_out_ep_desc = {
+        .bLength                = USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType        = USB_DT_ENDPOINT,
+        .bEndpointAddress       = USB_DIR_OUT,
+        .bmAttributes           = USB_ENDPOINT_XFER_INT,
+        /*.wMaxPacketSize       = DYNAMIC */
+        .bInterval              = 10, /* FIXME: Add this field in the
+                                       * HID gadget configuration?
+                                       * (struct hidg_func_descriptor)
+                                       */
+};
+
 static struct usb_descriptor_header *hidg_fs_descriptors[] = {
         (struct usb_descriptor_header *)&hidg_interface_desc,
         (struct usb_descriptor_header *)&hidg_desc,
         (struct usb_descriptor_header *)&hidg_fs_in_ep_desc,
+        (struct usb_descriptor_header *)&hidg_fs_out_ep_desc,
         NULL,
 };
 
@@ -130,9 +164,11 @@ static struct usb_descriptor_header *hidg_fs_descriptors[] = {
 static ssize_t f_hidg_read(struct file *file, char __user *buffer,
                         size_t count, loff_t *ptr)
 {
-        struct f_hidg   *hidg     = file->private_data;
-        char            *tmp_buff = NULL;
-        unsigned long   flags;
+        struct f_hidg *hidg = file->private_data;
+        struct f_hidg_req_list *list;
+        struct usb_request *req;
+        unsigned long flags;
+        int ret;
 
         if (!count)
                 return 0;
@@ -142,8 +178,9 @@ static ssize_t f_hidg_read(struct file *file, char __user *buffer,
 
         spin_lock_irqsave(&hidg->spinlock, flags);
 
-#define READ_COND (hidg->set_report_buff != NULL)
+#define READ_COND (!list_empty(&hidg->completed_out_req))
 
+        /* wait for at least one buffer to complete */
         while (!READ_COND) {
                 spin_unlock_irqrestore(&hidg->spinlock, flags);
                 if (file->f_flags & O_NONBLOCK)
@@ -155,19 +192,34 @@ static ssize_t f_hidg_read(struct file *file, char __user *buffer,
                 spin_lock_irqsave(&hidg->spinlock, flags);
         }
 
-
-        count = min_t(unsigned, count, hidg->set_report_length);
-        tmp_buff = hidg->set_report_buff;
-        hidg->set_report_buff = NULL;
-
+        /* pick the first one */
+        list = list_first_entry(&hidg->completed_out_req,
+                                struct f_hidg_req_list, list);
+        req = list->req;
+        count = min_t(unsigned int, count, req->actual - list->pos);
         spin_unlock_irqrestore(&hidg->spinlock, flags);
 
-        if (tmp_buff != NULL) {
-                /* copy to user outside spinlock */
-                count -= copy_to_user(buffer, tmp_buff, count);
-                kfree(tmp_buff);
-        } else
-                count = -ENOMEM;
+        /* copy to user outside spinlock */
+        count -= copy_to_user(buffer, req->buf + list->pos, count);
+        list->pos += count;
+
+        /*
+         * if this request is completely handled and transfered to
+         * userspace, remove its entry from the list and requeue it
+         * again. Otherwise, we will revisit it again upon the next
+         * call, taking into account its current read position.
+         */
+        if (list->pos == req->actual) {
+                spin_lock_irqsave(&hidg->spinlock, flags);
+                list_del(&list->list);
+                kfree(list);
+                spin_unlock_irqrestore(&hidg->spinlock, flags);
+
+                req->length = hidg->report_length;
+                ret = usb_ep_queue(hidg->out_ep, req, GFP_KERNEL);
+                if (ret < 0)
+                        return ret;
+        }
 
         return count;
 }
@@ -282,28 +334,37 @@ static int f_hidg_open(struct inode *inode, struct file *fd)
 /*-------------------------------------------------------------------------*/
 /*                                usb_function                             */
 
-static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req)
+static struct usb_request *hidg_alloc_ep_req(struct usb_ep *ep, unsigned length)
 {
-        struct f_hidg *hidg = (struct f_hidg *)req->context;
-
-        if (req->status != 0 || req->buf == NULL || req->actual == 0) {
-                ERROR(hidg->func.config->cdev, "%s FAILED\n", __func__);
-                return;
+        struct usb_request *req;
+
+        req = usb_ep_alloc_request(ep, GFP_ATOMIC);
+        if (req) {
+                req->length = length;
+                req->buf = kmalloc(length, GFP_ATOMIC);
+                if (!req->buf) {
+                        usb_ep_free_request(ep, req);
+                        req = NULL;
+                }
         }
+        return req;
+}
 
-        spin_lock(&hidg->spinlock);
-
-        hidg->set_report_buff = krealloc(hidg->set_report_buff,
-                                         req->actual, GFP_ATOMIC);
+static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req)
+{
+        struct f_hidg *hidg = (struct f_hidg *) req->context;
+        struct f_hidg_req_list *req_list;
+        unsigned long flags;
 
-        if (hidg->set_report_buff == NULL) {
-                spin_unlock(&hidg->spinlock);
+        req_list = kzalloc(sizeof(*req_list), GFP_ATOMIC);
+        if (!req_list)
                 return;
-        }
-        hidg->set_report_length = req->actual;
-        memcpy(hidg->set_report_buff, req->buf, req->actual);
 
-        spin_unlock(&hidg->spinlock);
+        req_list->req = req;
+
+        spin_lock_irqsave(&hidg->spinlock, flags);
+        list_add_tail(&req_list->list, &hidg->completed_out_req);
+        spin_unlock_irqrestore(&hidg->spinlock, flags);
 
         wake_up(&hidg->read_queue);
 }
@@ -344,9 +405,7 @@ static int hidg_setup(struct usb_function *f,
         case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8
                   | HID_REQ_SET_REPORT):
                 VDBG(cdev, "set_report | wLenght=%d\n", ctrl->wLength);
-                req->context  = hidg;
-                req->complete = hidg_set_report_complete;
-                goto respond;
+                goto stall;
                 break;
 
         case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8
@@ -403,16 +462,25 @@ respond:
 static void hidg_disable(struct usb_function *f)
 {
         struct f_hidg *hidg = func_to_hidg(f);
+        struct f_hidg_req_list *list, *next;
 
         usb_ep_disable(hidg->in_ep);
         hidg->in_ep->driver_data = NULL;
+
+        usb_ep_disable(hidg->out_ep);
+        hidg->out_ep->driver_data = NULL;
+
+        list_for_each_entry_safe(list, next, &hidg->completed_out_req, list) {
+                list_del(&list->list);
+                kfree(list);
+        }
 }
 
 static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 {
         struct usb_composite_dev                *cdev = f->config->cdev;
         struct f_hidg                           *hidg = func_to_hidg(f);
-        int status = 0;
+        int i, status = 0;
 
         VDBG(cdev, "hidg_set_alt intf:%d alt:%d\n", intf, alt);
 
@@ -429,11 +497,55 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
                 }
                 status = usb_ep_enable(hidg->in_ep);
                 if (status < 0) {
-                        ERROR(cdev, "Enable endpoint FAILED!\n");
+                        ERROR(cdev, "Enable IN endpoint FAILED!\n");
                         goto fail;
                 }
                 hidg->in_ep->driver_data = hidg;
         }
+
+
+        if (hidg->out_ep != NULL) {
+                /* restart endpoint */
+                if (hidg->out_ep->driver_data != NULL)
+                        usb_ep_disable(hidg->out_ep);
+
+                status = config_ep_by_speed(f->config->cdev->gadget, f,
+                                            hidg->out_ep);
+                if (status) {
+                        ERROR(cdev, "config_ep_by_speed FAILED!\n");
+                        goto fail;
+                }
+                status = usb_ep_enable(hidg->out_ep);
+                if (status < 0) {
+                        ERROR(cdev, "Enable IN endpoint FAILED!\n");
+                        goto fail;
+                }
+                hidg->out_ep->driver_data = hidg;
+
+                /*
+                 * allocate a bunch of read buffers and queue them all at once.
+                 */
+                for (i = 0; i < hidg->qlen && status == 0; i++) {
+                        struct usb_request *req =
+                                        hidg_alloc_ep_req(hidg->out_ep,
+                                                          hidg->report_length);
+                        if (req) {
+                                req->complete = hidg_set_report_complete;
+                                req->context  = hidg;
+                                status = usb_ep_queue(hidg->out_ep, req,
+                                                      GFP_ATOMIC);
+                                if (status)
+                                        ERROR(cdev, "%s queue req --> %d\n",
+                                                hidg->out_ep->name, status);
+                        } else {
+                                usb_ep_disable(hidg->out_ep);
+                                hidg->out_ep->driver_data = NULL;
+                                status = -ENOMEM;
+                                goto fail;
+                        }
+                }
+        }
+
 fail:
         return status;
 }
@@ -470,13 +582,18 @@ static int __init hidg_bind(struct usb_configuration *c, struct usb_function *f)
         ep->driver_data = c->cdev;      /* claim */
         hidg->in_ep = ep;
 
+        ep = usb_ep_autoconfig(c->cdev->gadget, &hidg_fs_out_ep_desc);
+        if (!ep)
+                goto fail;
+        ep->driver_data = c->cdev;      /* claim */
+        hidg->out_ep = ep;
+
         /* preallocate request and buffer */
         status = -ENOMEM;
         hidg->req = usb_ep_alloc_request(hidg->in_ep, GFP_KERNEL);
         if (!hidg->req)
                 goto fail;
 
-
         hidg->req->buf = kmalloc(hidg->report_length, GFP_KERNEL);
         if (!hidg->req->buf)
                 goto fail;
@@ -486,12 +603,12 @@ static int __init hidg_bind(struct usb_configuration *c, struct usb_function *f)
         hidg_interface_desc.bInterfaceProtocol = hidg->bInterfaceProtocol;
         hidg_hs_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
         hidg_fs_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
+        hidg_hs_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
+        hidg_fs_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);
         hidg_desc.desc[0].bDescriptorType = HID_DT_REPORT;
         hidg_desc.desc[0].wDescriptorLength =
                 cpu_to_le16(hidg->report_desc_length);
 
-        hidg->set_report_buff = NULL;
-
         /* copy descriptors */
         f->descriptors = usb_copy_descriptors(hidg_fs_descriptors);
         if (!f->descriptors)
@@ -500,6 +617,8 @@ static int __init hidg_bind(struct usb_configuration *c, struct usb_function *f)
         if (gadget_is_dualspeed(c->cdev->gadget)) {
                 hidg_hs_in_ep_desc.bEndpointAddress =
                         hidg_fs_in_ep_desc.bEndpointAddress;
+                hidg_hs_out_ep_desc.bEndpointAddress =
+                        hidg_fs_out_ep_desc.bEndpointAddress;
                 f->hs_descriptors = usb_copy_descriptors(hidg_hs_descriptors);
                 if (!f->hs_descriptors)
                         goto fail;
@@ -509,6 +628,7 @@ static int __init hidg_bind(struct usb_configuration *c, struct usb_function *f)
         spin_lock_init(&hidg->spinlock);
         init_waitqueue_head(&hidg->write_queue);
         init_waitqueue_head(&hidg->read_queue);
+        INIT_LIST_HEAD(&hidg->completed_out_req);
 
         /* create char device */
         cdev_init(&hidg->cdev, &f_hidg_fops);
@@ -553,7 +673,6 @@ static void hidg_unbind(struct usb_configuration *c, struct usb_function *f)
         usb_free_descriptors(f->descriptors);
 
         kfree(hidg->report_desc);
-        kfree(hidg->set_report_buff);
         kfree(hidg);
 }
 
@@ -624,6 +743,9 @@ int __init hidg_bind_config(struct usb_configuration *c,
         hidg->func.disable = hidg_disable;
         hidg->func.setup   = hidg_setup;
 
+        /* this could me made configurable at some point */
+        hidg->qlen         = 4;
+
         status = usb_add_function(c, &hidg->func);
         if (status)
                 kfree(hidg);
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index f67b453740bd..4f1142efa6d1 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -44,12 +44,12 @@
  * function for a USB device, it also illustrates a technique of
  * double-buffering for increased throughput.
  *
- * Function supports multiple logical units (LUNs).  Backing storage
- * for each LUN is provided by a regular file or a block device.
- * Access for each LUN can be limited to read-only.  Moreover, the
- * function can indicate that LUN is removable and/or CD-ROM.  (The
- * later implies read-only access.)
- *
+ * For more information about MSF and in particular its module
+ * parameters and sysfs interface read the
+ * <Documentation/usb/mass-storage.txt> file.
+ */
+
+/*
  * MSF is configured by specifying a fsg_config structure.  It has the
  * following fields:
  *
@@ -75,25 +75,6 @@
  *      ->nofua         Flag specifying that FUA flag in SCSI WRITE(10,12)
  *                              commands for this LUN shall be ignored.
  *
- *      lun_name_format A printf-like format for names of the LUN
- *                              devices.  This determines how the
- *                              directory in sysfs will be named.
- *                              Unless you are using several MSFs in
- *                              a single gadget (as opposed to single
- *                              MSF in many configurations) you may
- *                              leave it as NULL (in which case
- *                              "lun%d" will be used).  In the format
- *                              you can use "%d" to index LUNs for
- *                              MSF's with more than one LUN.  (Beware
- *                              that there is only one integer given
- *                              as an argument for the format and
- *                              specifying invalid format may cause
- *                              unspecified behaviour.)
- *      thread_name     Name of the kernel thread process used by the
- *                              MSF.  You can safely set it to NULL
- *                              (in which case default "file-storage"
- *                              will be used).
- *
  *      vendor_name
  *      product_name
  *      release         Information used as a reply to INQUIRY
@@ -114,62 +95,6 @@
  * data track and no audio tracks; hence there need be only one
  * backing file per LUN.
  *
- *
- * MSF includes support for module parameters.  If gadget using it
- * decides to use it, the following module parameters will be
- * available:
- *
- *      file=filename[,filename...]
- *                      Names of the files or block devices used for
- *                              backing storage.
- *      ro=b[,b...]     Default false, boolean for read-only access.
- *      removable=b[,b...]
- *                      Default true, boolean for removable media.
- *      cdrom=b[,b...]  Default false, boolean for whether to emulate
- *                              a CD-ROM drive.
- *      nofua=b[,b...]  Default false, booleans for ignore FUA flag
- *                              in SCSI WRITE(10,12) commands
- *      luns=N          Default N = number of filenames, number of
- *                              LUNs to support.
- *      stall           Default determined according to the type of
- *                              USB device controller (usually true),
- *                              boolean to permit the driver to halt
- *                              bulk endpoints.
- *
- * The module parameters may be prefixed with some string.  You need
- * to consult gadget's documentation or source to verify whether it is
- * using those module parameters and if it does what are the prefixes
- * (look for FSG_MODULE_PARAMETERS() macro usage, what's inside it is
- * the prefix).
- *
- *
- * Requirements are modest; only a bulk-in and a bulk-out endpoint are
- * needed.  The memory requirement amounts to two 16K buffers, size
- * configurable by a parameter.  Support is included for both
- * full-speed and high-speed operation.
- *
- * Note that the driver is slightly non-portable in that it assumes a
- * single memory/DMA buffer will be useable for bulk-in, bulk-out, and
- * interrupt-in endpoints.  With most device controllers this isn't an
- * issue, but there may be some with hardware restrictions that prevent
- * a buffer from being used by more than one endpoint.
- *
- *
- * The pathnames of the backing files and the ro settings are
- * available in the attribute files "file" and "ro" in the lun<n> (or
- * to be more precise in a directory which name comes from
- * "lun_name_format" option!) subdirectory of the gadget's sysfs
- * directory.  If the "removable" option is set, writing to these
- * files will simulate ejecting/loading the medium (writing an empty
- * line means eject) and adjusting a write-enable tab.  Changes to the
- * ro setting are not allowed when the medium is loaded or if CD-ROM
- * emulation is being used.
- *
- * When a LUN receive an "eject" SCSI request (Start/Stop Unit),
- * if the LUN is removable, the backing file is released to simulate
- * ejection.
- *
- *
  * This function is heavily based on "File-backed Storage Gadget" by
  * Alan Stern which in turn is heavily based on "Gadget Zero" by David
  * Brownell.  The driver's SCSI command interface was based on the
@@ -211,7 +136,7 @@
  * In normal operation the main thread is started during the gadget's
  * fsg_bind() callback and stopped during fsg_unbind().  But it can
  * also exit when it receives a signal, and there's no point leaving
- * the gadget running when the thread is dead.  At of this moment, MSF
+ * the gadget running when the thread is dead.  As of this moment, MSF
  * provides no way to deregister the gadget when thread dies -- maybe
  * a callback functions is needed.
  *
@@ -417,9 +342,6 @@ struct fsg_config {
                 char nofua;
         } luns[FSG_MAX_LUNS];
 
-        const char              *lun_name_format;
-        const char              *thread_name;
-
         /* Callback functions. */
         const struct fsg_operations     *ops;
         /* Gadget's private data. */
@@ -2687,11 +2609,15 @@ static int fsg_main_thread(void *common_)
 
 /*************************** DEVICE ATTRIBUTES ***************************/
 
-/* Write permission is checked per LUN in store_*() functions. */
 static DEVICE_ATTR(ro, 0644, fsg_show_ro, fsg_store_ro);
 static DEVICE_ATTR(nofua, 0644, fsg_show_nofua, fsg_store_nofua);
 static DEVICE_ATTR(file, 0644, fsg_show_file, fsg_store_file);
 
+static struct device_attribute dev_attr_ro_cdrom =
+        __ATTR(ro, 0444, fsg_show_ro, NULL);
+static struct device_attribute dev_attr_file_nonremovable =
+        __ATTR(file, 0444, fsg_show_file, NULL);
+
 
 /****************************** FSG COMMON ******************************/
 
@@ -2792,11 +2718,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
                 curlun->dev.parent = &gadget->dev;
                 /* curlun->dev.driver = &fsg_driver.driver; XXX */
                 dev_set_drvdata(&curlun->dev, &common->filesem);
-                dev_set_name(&curlun->dev,
-                             cfg->lun_name_format
-                           ? cfg->lun_name_format
-                           : "lun%d",
-                             i);
+                dev_set_name(&curlun->dev, "lun%d", i);
 
                 rc = device_register(&curlun->dev);
                 if (rc) {
@@ -2806,10 +2728,16 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
                         goto error_release;
                 }
 
-                rc = device_create_file(&curlun->dev, &dev_attr_ro);
+                rc = device_create_file(&curlun->dev,
+                                        curlun->cdrom
+                                      ? &dev_attr_ro_cdrom
+                                      : &dev_attr_ro);
                 if (rc)
                         goto error_luns;
-                rc = device_create_file(&curlun->dev, &dev_attr_file);
+                rc = device_create_file(&curlun->dev,
+                                        curlun->removable
+                                      ? &dev_attr_file
+                                      : &dev_attr_file_nonremovable);
                 if (rc)
                         goto error_luns;
                 rc = device_create_file(&curlun->dev, &dev_attr_nofua);
@@ -2878,8 +2806,7 @@ buffhds_first_it:
 
         /* Tell the thread to start working */
         common->thread_task =
-                kthread_create(fsg_main_thread, common,
-                               cfg->thread_name ?: "file-storage");
+                kthread_create(fsg_main_thread, common, "file-storage");
         if (IS_ERR(common->thread_task)) {
                 rc = PTR_ERR(common->thread_task);
                 goto error_release;
@@ -2945,8 +2872,14 @@ static void fsg_common_release(struct kref *ref)
                 /* In error recovery common->nluns may be zero. */
                 for (; i; --i, ++lun) {
                         device_remove_file(&lun->dev, &dev_attr_nofua);
-                        device_remove_file(&lun->dev, &dev_attr_ro);
-                        device_remove_file(&lun->dev, &dev_attr_file);
+                        device_remove_file(&lun->dev,
+                                           lun->cdrom
+                                         ? &dev_attr_ro_cdrom
+                                         : &dev_attr_ro);
+                        device_remove_file(&lun->dev,
+                                           lun->removable
+                                         ? &dev_attr_file
+                                         : &dev_attr_file_nonremovable);
                         fsg_lun_close(lun);
                         device_unregister(&lun->dev);
                 }
@@ -3167,8 +3100,7 @@ fsg_config_from_params(struct fsg_config *cfg,
         for (i = 0, lun = cfg->luns; i < cfg->nluns; ++i, ++lun) {
                 lun->ro = !!params->ro[i];
                 lun->cdrom = !!params->cdrom[i];
-                lun->removable = /* Removable by default */
-                        params->removable_count <= i || params->removable[i];
+                lun->removable = !!params->removable[i];
                 lun->filename =
                         params->file_count > i && params->file[i][0]
                         ? params->file[i]
@@ -3176,8 +3108,6 @@ fsg_config_from_params(struct fsg_config *cfg,
         }
 
         /* Let MSF use defaults */
-        cfg->lun_name_format = 0;
-        cfg->thread_name = 0;
         cfg->vendor_name = 0;
         cfg->product_name = 0;
         cfg->release = 0xffff;
@@ -3203,4 +3133,3 @@ fsg_common_from_params(struct fsg_common *common,
         fsg_config_from_params(&cfg, params);
         return fsg_common_init(common, cdev, &cfg);
 }
-
diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/f_uvc.c
index 2022fe492148..2a8bf0655c60 100644
--- a/drivers/usb/gadget/f_uvc.c
+++ b/drivers/usb/gadget/f_uvc.c
@@ -29,6 +29,25 @@
 
 unsigned int uvc_gadget_trace_param;
 
+/*-------------------------------------------------------------------------*/
+
+/* module parameters specific to the Video streaming endpoint */
+static unsigned streaming_interval = 1;
+module_param(streaming_interval, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(streaming_interval, "1 - 16");
+
+static unsigned streaming_maxpacket = 1024;
+module_param(streaming_maxpacket, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(streaming_maxpacket, "0 - 1023 (fs), 0 - 1024 (hs/ss)");
+
+static unsigned streaming_mult;
+module_param(streaming_mult, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(streaming_mult, "0 - 2 (hs/ss only)");
+
+static unsigned streaming_maxburst;
+module_param(streaming_maxburst, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(streaming_maxburst, "0 - 15 (ss only)");
+
 /* --------------------------------------------------------------------------
  * Function descriptors
  */
@@ -59,6 +78,8 @@ static struct usb_gadget_strings *uvc_function_strings[] = {
 #define UVC_INTF_VIDEO_CONTROL                  0
 #define UVC_INTF_VIDEO_STREAMING                1
 
+#define STATUS_BYTECOUNT                        16      /* 16 bytes status */
+
 static struct usb_interface_assoc_descriptor uvc_iad __initdata = {
         .bLength                = sizeof(uvc_iad),
         .bDescriptorType        = USB_DT_INTERFACE_ASSOCIATION,
@@ -82,12 +103,12 @@ static struct usb_interface_descriptor uvc_control_intf __initdata = {
         .iInterface             = 0,
 };
 
-static struct usb_endpoint_descriptor uvc_control_ep __initdata = {
+static struct usb_endpoint_descriptor uvc_fs_control_ep __initdata = {
         .bLength                = USB_DT_ENDPOINT_SIZE,
         .bDescriptorType        = USB_DT_ENDPOINT,
         .bEndpointAddress       = USB_DIR_IN,
         .bmAttributes           = USB_ENDPOINT_XFER_INT,
-        .wMaxPacketSize         = cpu_to_le16(16),
+        .wMaxPacketSize         = cpu_to_le16(STATUS_BYTECOUNT),
         .bInterval              = 8,
 };
 
@@ -95,7 +116,7 @@ static struct uvc_control_endpoint_descriptor uvc_control_cs_ep __initdata = {
         .bLength                = UVC_DT_CONTROL_ENDPOINT_SIZE,
         .bDescriptorType        = USB_DT_CS_ENDPOINT,
         .bDescriptorSubType     = UVC_EP_INTERRUPT,
-        .wMaxTransferSize       = cpu_to_le16(16),
+        .wMaxTransferSize       = cpu_to_le16(STATUS_BYTECOUNT),
 };
 
 static struct usb_interface_descriptor uvc_streaming_intf_alt0 __initdata = {
@@ -122,7 +143,7 @@ static struct usb_interface_descriptor uvc_streaming_intf_alt1 __initdata = {
         .iInterface             = 0,
 };
 
-static struct usb_endpoint_descriptor uvc_streaming_ep = {
+static struct usb_endpoint_descriptor uvc_fs_streaming_ep = {
         .bLength                = USB_DT_ENDPOINT_SIZE,
         .bDescriptorType        = USB_DT_ENDPOINT,
         .bEndpointAddress       = USB_DIR_IN,
@@ -131,15 +152,72 @@ static struct usb_endpoint_descriptor uvc_streaming_ep = {
         .bInterval              = 1,
 };
 
+static struct usb_endpoint_descriptor uvc_hs_streaming_ep = {
+        .bLength                = USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType        = USB_DT_ENDPOINT,
+        .bEndpointAddress       = USB_DIR_IN,
+        .bmAttributes           = USB_ENDPOINT_XFER_ISOC,
+        .wMaxPacketSize         = cpu_to_le16(1024),
+        .bInterval              = 1,
+};
+
+/* super speed support */
+static struct usb_endpoint_descriptor uvc_ss_control_ep __initdata = {
+        .bLength =              USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType =      USB_DT_ENDPOINT,
+
+        .bEndpointAddress =     USB_DIR_IN,
+        .bmAttributes =         USB_ENDPOINT_XFER_INT,
+        .wMaxPacketSize =       cpu_to_le16(STATUS_BYTECOUNT),
+        .bInterval =            8,
+};
+
+static struct usb_ss_ep_comp_descriptor uvc_ss_control_comp __initdata = {
+        .bLength =              sizeof uvc_ss_control_comp,
+        .bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,
+
+        /* the following 3 values can be tweaked if necessary */
+        /* .bMaxBurst =         0, */
+        /* .bmAttributes =      0, */
+        .wBytesPerInterval =    cpu_to_le16(STATUS_BYTECOUNT),
+};
+
+static struct usb_endpoint_descriptor uvc_ss_streaming_ep __initdata = {
+        .bLength =              USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType =      USB_DT_ENDPOINT,
+
+        .bEndpointAddress =     USB_DIR_IN,
+        .bmAttributes =         USB_ENDPOINT_XFER_ISOC,
+        .wMaxPacketSize =       cpu_to_le16(1024),
+        .bInterval =            4,
+};
+
+static struct usb_ss_ep_comp_descriptor uvc_ss_streaming_comp = {
+        .bLength =              sizeof uvc_ss_streaming_comp,
+        .bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,
+
+        /* the following 3 values can be tweaked if necessary */
+        .bMaxBurst =            0,
+        .bmAttributes = 0,
+        .wBytesPerInterval =    cpu_to_le16(1024),
+};
+
 static const struct usb_descriptor_header * const uvc_fs_streaming[] = {
         (struct usb_descriptor_header *) &uvc_streaming_intf_alt1,
-        (struct usb_descriptor_header *) &uvc_streaming_ep,
+        (struct usb_descriptor_header *) &uvc_fs_streaming_ep,
         NULL,
 };
 
 static const struct usb_descriptor_header * const uvc_hs_streaming[] = {
         (struct usb_descriptor_header *) &uvc_streaming_intf_alt1,
-        (struct usb_descriptor_header *) &uvc_streaming_ep,
+        (struct usb_descriptor_header *) &uvc_hs_streaming_ep,
+        NULL,
+};
+
+static const struct usb_descriptor_header * const uvc_ss_streaming[] = {
+        (struct usb_descriptor_header *) &uvc_streaming_intf_alt1,
+        (struct usb_descriptor_header *) &uvc_ss_streaming_ep,
+        (struct usb_descriptor_header *) &uvc_ss_streaming_comp,
         NULL,
 };
 
@@ -215,6 +293,7 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt)
         struct uvc_device *uvc = to_uvc(f);
         struct v4l2_event v4l2_event;
         struct uvc_event *uvc_event = (void *)&v4l2_event.u.data;
+        int ret;
 
         INFO(f->config->cdev, "uvc_function_set_alt(%u, %u)\n", interface, alt);
 
@@ -262,7 +341,10 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt)
                         return 0;
 
                 if (uvc->video.ep) {
-                        uvc->video.ep->desc = &uvc_streaming_ep;
+                        ret = config_ep_by_speed(f->config->cdev->gadget,
+                                        &(uvc->func), uvc->video.ep);
+                        if (ret)
+                                return ret;
                         usb_ep_enable(uvc->video.ep);
                 }
 
@@ -368,9 +450,11 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
 {
         struct uvc_input_header_descriptor *uvc_streaming_header;
         struct uvc_header_descriptor *uvc_control_header;
+        const struct uvc_descriptor_header * const *uvc_control_desc;
         const struct uvc_descriptor_header * const *uvc_streaming_cls;
         const struct usb_descriptor_header * const *uvc_streaming_std;
         const struct usb_descriptor_header * const *src;
+        static struct usb_endpoint_descriptor *uvc_control_ep;
         struct usb_descriptor_header **dst;
         struct usb_descriptor_header **hdr;
         unsigned int control_size;
@@ -379,10 +463,29 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
         unsigned int bytes;
         void *mem;
 
-        uvc_streaming_cls = (speed == USB_SPEED_FULL)
-                          ? uvc->desc.fs_streaming : uvc->desc.hs_streaming;
-        uvc_streaming_std = (speed == USB_SPEED_FULL)
-                          ? uvc_fs_streaming : uvc_hs_streaming;
+        switch (speed) {
+        case USB_SPEED_SUPER:
+                uvc_control_desc = uvc->desc.ss_control;
+                uvc_streaming_cls = uvc->desc.ss_streaming;
+                uvc_streaming_std = uvc_ss_streaming;
+                uvc_control_ep = &uvc_ss_control_ep;
+                break;
+
+        case USB_SPEED_HIGH:
+                uvc_control_desc = uvc->desc.fs_control;
+                uvc_streaming_cls = uvc->desc.hs_streaming;
+                uvc_streaming_std = uvc_hs_streaming;
+                uvc_control_ep = &uvc_fs_control_ep;
+                break;
+
+        case USB_SPEED_FULL:
+        default:
+                uvc_control_desc = uvc->desc.fs_control;
+                uvc_streaming_cls = uvc->desc.fs_streaming;
+                uvc_streaming_std = uvc_fs_streaming;
+                uvc_control_ep = &uvc_fs_control_ep;
+                break;
+        }
 
         /* Descriptors layout
          *
@@ -400,16 +503,24 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
         control_size = 0;
         streaming_size = 0;
         bytes = uvc_iad.bLength + uvc_control_intf.bLength
-              + uvc_control_ep.bLength + uvc_control_cs_ep.bLength
+              + uvc_control_ep->bLength + uvc_control_cs_ep.bLength
               + uvc_streaming_intf_alt0.bLength;
-        n_desc = 5;
 
-        for (src = (const struct usb_descriptor_header**)uvc->desc.control; *src; ++src) {
+        if (speed == USB_SPEED_SUPER) {
+                bytes += uvc_ss_control_comp.bLength;
+                n_desc = 6;
+        } else {
+                n_desc = 5;
+        }
+
+        for (src = (const struct usb_descriptor_header **)uvc_control_desc;
+                        *src; ++src) {
                 control_size += (*src)->bLength;
                 bytes += (*src)->bLength;
                 n_desc++;
         }
-        for (src = (const struct usb_descriptor_header**)uvc_streaming_cls; *src; ++src) {
+        for (src = (const struct usb_descriptor_header **)uvc_streaming_cls;
+                        *src; ++src) {
                 streaming_size += (*src)->bLength;
                 bytes += (*src)->bLength;
                 n_desc++;
@@ -433,12 +544,15 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
 
         uvc_control_header = mem;
         UVC_COPY_DESCRIPTORS(mem, dst,
-                (const struct usb_descriptor_header**)uvc->desc.control);
+                (const struct usb_descriptor_header **)uvc_control_desc);
         uvc_control_header->wTotalLength = cpu_to_le16(control_size);
         uvc_control_header->bInCollection = 1;
         uvc_control_header->baInterfaceNr[0] = uvc->streaming_intf;
 
-        UVC_COPY_DESCRIPTOR(mem, dst, &uvc_control_ep);
+        UVC_COPY_DESCRIPTOR(mem, dst, uvc_control_ep);
+        if (speed == USB_SPEED_SUPER)
+                UVC_COPY_DESCRIPTOR(mem, dst, &uvc_ss_control_comp);
+
         UVC_COPY_DESCRIPTOR(mem, dst, &uvc_control_cs_ep);
         UVC_COPY_DESCRIPTOR(mem, dst, &uvc_streaming_intf_alt0);
 
@@ -446,7 +560,8 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)
         UVC_COPY_DESCRIPTORS(mem, dst,
                 (const struct usb_descriptor_header**)uvc_streaming_cls);
         uvc_streaming_header->wTotalLength = cpu_to_le16(streaming_size);
-        uvc_streaming_header->bEndpointAddress = uvc_streaming_ep.bEndpointAddress;
+        uvc_streaming_header->bEndpointAddress =
+                uvc_fs_streaming_ep.bEndpointAddress;
 
         UVC_COPY_DESCRIPTORS(mem, dst, uvc_streaming_std);
 
@@ -482,6 +597,7 @@ uvc_function_unbind(struct usb_configuration *c, struct usb_function *f)
 
         kfree(f->descriptors);
         kfree(f->hs_descriptors);
+        kfree(f->ss_descriptors);
 
         kfree(uvc);
 }
@@ -496,8 +612,26 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
 
         INFO(cdev, "uvc_function_bind\n");
 
+        /* sanity check the streaming endpoint module parameters */
+        if (streaming_interval < 1)
+                streaming_interval = 1;
+        if (streaming_interval > 16)
+                streaming_interval = 16;
+        if (streaming_mult > 2)
+                streaming_mult = 2;
+        if (streaming_maxburst > 15)
+                streaming_maxburst = 15;
+
+        /*
+         * fill in the FS video streaming specific descriptors from the
+         * module parameters
+         */
+        uvc_fs_streaming_ep.wMaxPacketSize = streaming_maxpacket > 1023 ?
+                                                1023 : streaming_maxpacket;
+        uvc_fs_streaming_ep.bInterval = streaming_interval;
+
         /* Allocate endpoints. */
-        ep = usb_ep_autoconfig(cdev->gadget, &uvc_control_ep);
+        ep = usb_ep_autoconfig(cdev->gadget, &uvc_fs_control_ep);
         if (!ep) {
                 INFO(cdev, "Unable to allocate control EP\n");
                 goto error;
@@ -505,7 +639,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         uvc->control_ep = ep;
         ep->driver_data = uvc;
 
-        ep = usb_ep_autoconfig(cdev->gadget, &uvc_streaming_ep);
+        ep = usb_ep_autoconfig(cdev->gadget, &uvc_fs_streaming_ep);
         if (!ep) {
                 INFO(cdev, "Unable to allocate streaming EP\n");
                 goto error;
@@ -526,9 +660,52 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
         uvc_streaming_intf_alt1.bInterfaceNumber = ret;
         uvc->streaming_intf = ret;
 
-        /* Copy descriptors. */
+        /* sanity check the streaming endpoint module parameters */
+        if (streaming_maxpacket > 1024)
+                streaming_maxpacket = 1024;
+
+        /* Copy descriptors for FS. */
         f->descriptors = uvc_copy_descriptors(uvc, USB_SPEED_FULL);
-        f->hs_descriptors = uvc_copy_descriptors(uvc, USB_SPEED_HIGH);
+
+        /* support high speed hardware */
+        if (gadget_is_dualspeed(cdev->gadget)) {
+                /*
+                 * Fill in the HS descriptors from the module parameters for the
+                 * Video Streaming endpoint.
+                 * NOTE: We assume that the user knows what they are doing and
+                 * won't give parameters that their UDC doesn't support.
+                 */
+                uvc_hs_streaming_ep.wMaxPacketSize = streaming_maxpacket;
+                uvc_hs_streaming_ep.wMaxPacketSize |= streaming_mult << 11;
+                uvc_hs_streaming_ep.bInterval = streaming_interval;
+                uvc_hs_streaming_ep.bEndpointAddress =
+                                uvc_fs_streaming_ep.bEndpointAddress;
+
+                /* Copy descriptors. */
+                f->hs_descriptors = uvc_copy_descriptors(uvc, USB_SPEED_HIGH);
+        }
+
+        /* support super speed hardware */
+        if (gadget_is_superspeed(c->cdev->gadget)) {
+                /*
+                 * Fill in the SS descriptors from the module parameters for the
+                 * Video Streaming endpoint.
+                 * NOTE: We assume that the user knows what they are doing and
+                 * won't give parameters that their UDC doesn't support.
+                 */
+                uvc_ss_streaming_ep.wMaxPacketSize = streaming_maxpacket;
+                uvc_ss_streaming_ep.bInterval = streaming_interval;
+                uvc_ss_streaming_comp.bmAttributes = streaming_mult;
+                uvc_ss_streaming_comp.bMaxBurst = streaming_maxburst;
+                uvc_ss_streaming_comp.wBytesPerInterval =
+                        streaming_maxpacket * (streaming_mult + 1) *
+                        (streaming_maxburst + 1);
+                uvc_ss_streaming_ep.bEndpointAddress =
+                                uvc_fs_streaming_ep.bEndpointAddress;
+
+                /* Copy descriptors. */
+                f->ss_descriptors = uvc_copy_descriptors(uvc, USB_SPEED_SUPER);
+        }
 
         /* Preallocate control endpoint request. */
         uvc->control_req = usb_ep_alloc_request(cdev->gadget->ep0, GFP_KERNEL);
@@ -583,9 +760,11 @@ error:
  */
 int __init
 uvc_bind_config(struct usb_configuration *c,
-                const struct uvc_descriptor_header * const *control,
+                const struct uvc_descriptor_header * const *fs_control,
+                const struct uvc_descriptor_header * const *ss_control,
                 const struct uvc_descriptor_header * const *fs_streaming,
-                const struct uvc_descriptor_header * const *hs_streaming)
+                const struct uvc_descriptor_header * const *hs_streaming,
+                const struct uvc_descriptor_header * const *ss_streaming)
 {
         struct uvc_device *uvc;
         int ret = 0;
@@ -603,38 +782,54 @@ uvc_bind_config(struct usb_configuration *c,
         uvc->state = UVC_STATE_DISCONNECTED;
 
         /* Validate the descriptors. */
-        if (control == NULL || control[0] == NULL ||
-            control[0]->bDescriptorSubType != UVC_VC_HEADER)
+        if (fs_control == NULL || fs_control[0] == NULL ||
+                fs_control[0]->bDescriptorSubType != UVC_VC_HEADER)
                 goto error;
 
-        if (fs_streaming == NULL || fs_streaming[0] == NULL ||
-            fs_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
+        if (ss_control == NULL || ss_control[0] == NULL ||
+                ss_control[0]->bDescriptorSubType != UVC_VC_HEADER)
                 goto error;
 
-        if (hs_streaming == NULL || hs_streaming[0] == NULL ||
-            hs_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
+        if (fs_streaming == NULL || fs_streaming[0] == NULL ||
+                fs_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
                 goto error;
 
-        uvc->desc.control = control;
-        uvc->desc.fs_streaming = fs_streaming;
-        uvc->desc.hs_streaming = hs_streaming;
-
-        /* Allocate string descriptor numbers. */
-        if ((ret = usb_string_id(c->cdev)) < 0)
+        if (hs_streaming == NULL || hs_streaming[0] == NULL ||
+                hs_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
                 goto error;
-        uvc_en_us_strings[UVC_STRING_ASSOCIATION_IDX].id = ret;
-        uvc_iad.iFunction = ret;
 
-        if ((ret = usb_string_id(c->cdev)) < 0)
+        if (ss_streaming == NULL || ss_streaming[0] == NULL ||
+                ss_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
                 goto error;
-        uvc_en_us_strings[UVC_STRING_CONTROL_IDX].id = ret;
-        uvc_control_intf.iInterface = ret;
 
-        if ((ret = usb_string_id(c->cdev)) < 0)
-                goto error;
-        uvc_en_us_strings[UVC_STRING_STREAMING_IDX].id = ret;
-        uvc_streaming_intf_alt0.iInterface = ret;
-        uvc_streaming_intf_alt1.iInterface = ret;
+        uvc->desc.fs_control = fs_control;
+        uvc->desc.ss_control = ss_control;
+        uvc->desc.fs_streaming = fs_streaming;
+        uvc->desc.hs_streaming = hs_streaming;
+        uvc->desc.ss_streaming = ss_streaming;
+
+        /* maybe allocate device-global string IDs, and patch descriptors */
+        if (uvc_en_us_strings[UVC_STRING_ASSOCIATION_IDX].id == 0) {
+                /* Allocate string descriptor numbers. */
+                ret = usb_string_id(c->cdev);
+                if (ret < 0)
+                        goto error;
+                uvc_en_us_strings[UVC_STRING_ASSOCIATION_IDX].id = ret;
+                uvc_iad.iFunction = ret;
+
+                ret = usb_string_id(c->cdev);
+                if (ret < 0)
+                        goto error;
+                uvc_en_us_strings[UVC_STRING_CONTROL_IDX].id = ret;
+                uvc_control_intf.iInterface = ret;
+
+                ret = usb_string_id(c->cdev);
+                if (ret < 0)
+                        goto error;
+                uvc_en_us_strings[UVC_STRING_STREAMING_IDX].id = ret;
+                uvc_streaming_intf_alt0.iInterface = ret;
+                uvc_streaming_intf_alt1.iInterface = ret;
+        }
 
         /* Register the function. */
         uvc->func.name = "uvc";
diff --git a/drivers/usb/gadget/f_uvc.h b/drivers/usb/gadget/f_uvc.h
index abf832935134..c3d258d30188 100644
--- a/drivers/usb/gadget/f_uvc.h
+++ b/drivers/usb/gadget/f_uvc.h
@@ -17,9 +17,11 @@
 #include <linux/usb/video.h>
 
 extern int uvc_bind_config(struct usb_configuration *c,
-                           const struct uvc_descriptor_header * const *control,
-                           const struct uvc_descriptor_header * const *fs_streaming,
-                           const struct uvc_descriptor_header * const *hs_streaming);
+                   const struct uvc_descriptor_header * const *fs_control,
+                   const struct uvc_descriptor_header * const *hs_control,
+                   const struct uvc_descriptor_header * const *fs_streaming,
+                   const struct uvc_descriptor_header * const *hs_streaming,
+                   const struct uvc_descriptor_header * const *ss_streaming);
 
 #endif /* _F_UVC_H_ */
 
diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
index dcbc0a2e48dd..1b0f086426bd 100644
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/fsl_mxc_udc.c
@@ -21,7 +21,8 @@
 #include <mach/hardware.h>
 
 static struct clk *mxc_ahb_clk;
-static struct clk *mxc_usb_clk;
+static struct clk *mxc_per_clk;
+static struct clk *mxc_ipg_clk;
 
 /* workaround ENGcm09152 for i.MX35 */
 #define USBPHYCTRL_OTGBASE_OFFSET       0x608
@@ -35,28 +36,31 @@ int fsl_udc_clk_init(struct platform_device *pdev)
 
         pdata = pdev->dev.platform_data;
 
-        if (!cpu_is_mx35() && !cpu_is_mx25()) {
-                mxc_ahb_clk = clk_get(&pdev->dev, "usb_ahb");
-                if (IS_ERR(mxc_ahb_clk))
-                        return PTR_ERR(mxc_ahb_clk);
+        mxc_ipg_clk = devm_clk_get(&pdev->dev, "ipg");
+        if (IS_ERR(mxc_ipg_clk)) {
+                dev_err(&pdev->dev, "clk_get(\"ipg\") failed\n");
+                return PTR_ERR(mxc_ipg_clk);
+        }
 
-                ret = clk_enable(mxc_ahb_clk);
-                if (ret < 0) {
-                        dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n");
-                        goto eenahb;
-                }
+        mxc_ahb_clk = devm_clk_get(&pdev->dev, "ahb");
+        if (IS_ERR(mxc_ahb_clk)) {
+                dev_err(&pdev->dev, "clk_get(\"ahb\") failed\n");
+                return PTR_ERR(mxc_ahb_clk);
         }
 
-        /* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */
-        mxc_usb_clk = clk_get(&pdev->dev, "usb");
-        if (IS_ERR(mxc_usb_clk)) {
-                dev_err(&pdev->dev, "clk_get(\"usb\") failed\n");
-                ret = PTR_ERR(mxc_usb_clk);
-                goto egusb;
+        mxc_per_clk = devm_clk_get(&pdev->dev, "per");
+        if (IS_ERR(mxc_per_clk)) {
+                dev_err(&pdev->dev, "clk_get(\"per\") failed\n");
+                return PTR_ERR(mxc_per_clk);
         }
 
+        clk_prepare_enable(mxc_ipg_clk);
+        clk_prepare_enable(mxc_ahb_clk);
+        clk_prepare_enable(mxc_per_clk);
+
+        /* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */
         if (!cpu_is_mx51()) {
-                freq = clk_get_rate(mxc_usb_clk);
+                freq = clk_get_rate(mxc_per_clk);
                 if (pdata->phy_mode != FSL_USB2_PHY_ULPI &&
                     (freq < 59999000 || freq > 60001000)) {
                         dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq);
@@ -65,24 +69,13 @@ int fsl_udc_clk_init(struct platform_device *pdev)
                 }
         }
 
-        ret = clk_enable(mxc_usb_clk);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "clk_enable(\"usb_clk\") failed\n");
-                goto eenusb;
-        }
-
         return 0;
 
-eenusb:
 eclkrate:
-        clk_put(mxc_usb_clk);
-        mxc_usb_clk = NULL;
-egusb:
-        if (!cpu_is_mx35())
-                clk_disable(mxc_ahb_clk);
-eenahb:
-        if (!cpu_is_mx35())
-                clk_put(mxc_ahb_clk);
+        clk_disable_unprepare(mxc_ipg_clk);
+        clk_disable_unprepare(mxc_ahb_clk);
+        clk_disable_unprepare(mxc_per_clk);
+        mxc_per_clk = NULL;
         return ret;
 }
 
@@ -104,20 +97,15 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)
 
         /* ULPI transceivers don't need usbpll */
         if (pdata->phy_mode == FSL_USB2_PHY_ULPI) {
-                clk_disable(mxc_usb_clk);
-                clk_put(mxc_usb_clk);
-                mxc_usb_clk = NULL;
+                clk_disable_unprepare(mxc_per_clk);
+                mxc_per_clk = NULL;
         }
 }
 
 void fsl_udc_clk_release(void)
 {
-        if (mxc_usb_clk) {
-                clk_disable(mxc_usb_clk);
-                clk_put(mxc_usb_clk);
-        }
-        if (!cpu_is_mx35()) {
-                clk_disable(mxc_ahb_clk);
-                clk_put(mxc_ahb_clk);
-        }
+        if (mxc_per_clk)
+                clk_disable_unprepare(mxc_per_clk);
+        clk_disable_unprepare(mxc_ahb_clk);
+        clk_disable_unprepare(mxc_ipg_clk);
 }
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index bc6f9bb9994a..a65ca0f5d8c4 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -2560,6 +2560,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
         dev_set_name(&udc_controller->gadget.dev, "gadget");
         udc_controller->gadget.dev.release = fsl_udc_release;
         udc_controller->gadget.dev.parent = &pdev->dev;
+        udc_controller->gadget.dev.of_node = pdev->dev.of_node;
         ret = device_register(&udc_controller->gadget.dev);
         if (ret < 0)
                 goto err_free_irq;
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index 54034f84f992..dc5334856afe 100644
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -1432,7 +1432,7 @@ static int __init imx_udc_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "can't get USB clock\n");
                 goto fail2;
         }
-        clk_enable(clk);
+        clk_prepare_enable(clk);
 
         if (clk_get_rate(clk) != 48000000) {
                 D_INI(&pdev->dev,
@@ -1496,7 +1496,7 @@ fail4:
                 free_irq(imx_usb->usbd_int[i], imx_usb);
 fail3:
         clk_put(clk);
-        clk_disable(clk);
+        clk_disable_unprepare(clk);
 fail2:
         iounmap(base);
 fail1:
@@ -1521,7 +1521,7 @@ static int __exit imx_udc_remove(struct platform_device *pdev)
                 free_irq(imx_usb->usbd_int[i], imx_usb);
 
         clk_put(imx_usb->clk);
-        clk_disable(imx_usb->clk);
+        clk_disable_unprepare(imx_usb->clk);
         iounmap(imx_usb->base);
 
         release_mem_region(imx_usb->res->start, resource_size(imx_usb->res));
diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
index 2ab0388d93eb..f1ec99e69cb7 100644
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/lpc32xx_udc.c
@@ -165,6 +165,7 @@ struct lpc32xx_udc {
         int                     udp_irq[4];
         struct clk              *usb_pll_clk;
         struct clk              *usb_slv_clk;
+        struct clk              *usb_otg_clk;
 
         /* DMA support */
         u32                     *udca_v_base;
@@ -227,33 +228,15 @@ static inline struct lpc32xx_udc *to_udc(struct usb_gadget *g)
 #define UDCA_BUFF_SIZE (128)
 
 /* TODO: When the clock framework is introduced in LPC32xx, IO_ADDRESS will
- * be replaced with an inremap()ed pointer, see USB_OTG_CLK_CTRL()
+ * be replaced with an inremap()ed pointer
  * */
 #define USB_CTRL                IO_ADDRESS(LPC32XX_CLK_PM_BASE + 0x64)
-#define USB_CLOCK_MASK          (AHB_M_CLOCK_ON | OTG_CLOCK_ON | \
-                                 DEV_CLOCK_ON | I2C_CLOCK_ON)
 
 /* USB_CTRL bit defines */
 #define USB_SLAVE_HCLK_EN       (1 << 24)
 #define USB_HOST_NEED_CLK_EN    (1 << 21)
 #define USB_DEV_NEED_CLK_EN     (1 << 22)
 
-#define USB_OTG_CLK_CTRL(udc)   ((udc)->udp_baseaddr + 0xFF4)
-#define USB_OTG_CLK_STAT(udc)   ((udc)->udp_baseaddr + 0xFF8)
-
-/* USB_OTG_CLK_CTRL bit defines */
-#define AHB_M_CLOCK_ON          (1 << 4)
-#define OTG_CLOCK_ON            (1 << 3)
-#define I2C_CLOCK_ON            (1 << 2)
-#define DEV_CLOCK_ON            (1 << 1)
-#define HOST_CLOCK_ON           (1 << 0)
-
-#define USB_OTG_STAT_CONTROL(udc) (udc->udp_baseaddr + 0x110)
-
-/* USB_OTG_STAT_CONTROL bit defines */
-#define TRANSPARENT_I2C_EN      (1 << 7)
-#define HOST_EN                 (1 << 0)
-
 /**********************************************************************
  * USB device controller register offsets
  **********************************************************************/
@@ -677,7 +660,7 @@ static void isp1301_udc_configure(struct lpc32xx_udc *udc)
                 ISP1301_I2C_INTERRUPT_RISING, INT_VBUS_VLD);
 
         /* Enable usb_need_clk clock after transceiver is initialized */
-        writel((readl(USB_CTRL) | (1 << 22)), USB_CTRL);
+        writel((readl(USB_CTRL) | USB_DEV_NEED_CLK_EN), USB_CTRL);
 
         dev_info(udc->dev, "ISP1301 Vendor ID  : 0x%04x\n",
                  i2c_smbus_read_word_data(udc->isp1301_i2c_client, 0x00));
@@ -1010,11 +993,8 @@ static void udc_dd_free(struct lpc32xx_udc *udc, struct lpc32xx_usbd_dd_gad *dd)
 /* Enables or disables most of the USB system clocks when low power mode is
  * needed. Clocks are typically started on a connection event, and disabled
  * when a cable is disconnected */
-#define OTGOFF_CLK_MASK (AHB_M_CLOCK_ON | I2C_CLOCK_ON)
 static void udc_clk_set(struct lpc32xx_udc *udc, int enable)
 {
-        int to = 1000;
-
         if (enable != 0) {
                 if (udc->clocked)
                         return;
@@ -1028,14 +1008,7 @@ static void udc_clk_set(struct lpc32xx_udc *udc, int enable)
                 writel(readl(USB_CTRL) | USB_DEV_NEED_CLK_EN,
                              USB_CTRL);
 
-                /* Set to enable all needed USB OTG clocks */
-                writel(USB_CLOCK_MASK, USB_OTG_CLK_CTRL(udc));
-
-                while (((readl(USB_OTG_CLK_STAT(udc)) & USB_CLOCK_MASK) !=
-                        USB_CLOCK_MASK) && (to > 0))
-                        to--;
-                if (!to)
-                        dev_dbg(udc->dev, "Cannot enable USB OTG clocking\n");
+                clk_enable(udc->usb_otg_clk);
         } else {
                 if (!udc->clocked)
                         return;
@@ -1047,19 +1020,11 @@ static void udc_clk_set(struct lpc32xx_udc *udc, int enable)
                 /* 48MHz PLL dpwn */
                 clk_disable(udc->usb_pll_clk);
 
-                /* Enable the USB device clock */
+                /* Disable the USB device clock */
                 writel(readl(USB_CTRL) & ~USB_DEV_NEED_CLK_EN,
                              USB_CTRL);
 
-                /* Set to enable all needed USB OTG clocks */
-                writel(OTGOFF_CLK_MASK, USB_OTG_CLK_CTRL(udc));
-
-                while (((readl(USB_OTG_CLK_STAT(udc)) &
-                         OTGOFF_CLK_MASK) !=
-                        OTGOFF_CLK_MASK) && (to > 0))
-                        to--;
-                if (!to)
-                        dev_dbg(udc->dev, "Cannot disable USB OTG clocking\n");
+                clk_disable(udc->usb_otg_clk);
         }
 }
 
@@ -3041,6 +3006,7 @@ static int lpc32xx_start(struct usb_gadget_driver *driver,
 
         udc->driver = driver;
         udc->gadget.dev.driver = &driver->driver;
+        udc->gadget.dev.of_node = udc->dev->of_node;
         udc->enabled = 1;
         udc->selfpowered = 1;
         udc->vbus = 0;
@@ -3239,6 +3205,12 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
                 retval = PTR_ERR(udc->usb_slv_clk);
                 goto usb_clk_get_fail;
         }
+        udc->usb_otg_clk = clk_get(&pdev->dev, "ck_usb_otg");
+        if (IS_ERR(udc->usb_otg_clk)) {
+                dev_err(udc->dev, "failed to acquire USB otg clock\n");
+                retval = PTR_ERR(udc->usb_slv_clk);
+                goto usb_otg_clk_get_fail;
+        }
 
         /* Setup PLL clock to 48MHz */
         retval = clk_enable(udc->usb_pll_clk);
@@ -3262,15 +3234,12 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
                 goto usb_clk_enable_fail;
         }
 
-        /* Set to enable all needed USB OTG clocks */
-        writel(USB_CLOCK_MASK, USB_OTG_CLK_CTRL(udc));
-
-        i = 1000;
-        while (((readl(USB_OTG_CLK_STAT(udc)) & USB_CLOCK_MASK) !=
-                USB_CLOCK_MASK) && (i > 0))
-                i--;
-        if (!i)
-                dev_dbg(udc->dev, "USB OTG clocks not correctly enabled\n");
+        /* Enable USB OTG clock */
+        retval = clk_enable(udc->usb_otg_clk);
+        if (retval < 0) {
+                dev_err(udc->dev, "failed to start USB otg clock\n");
+                goto usb_otg_clk_enable_fail;
+        }
 
         /* Setup deferred workqueue data */
         udc->poweron = udc->pullup = 0;
@@ -3390,12 +3359,16 @@ dma_alloc_fail:
         dma_free_coherent(&pdev->dev, UDCA_BUFF_SIZE,
                           udc->udca_v_base, udc->udca_p_base);
 i2c_fail:
+        clk_disable(udc->usb_otg_clk);
+usb_otg_clk_enable_fail:
         clk_disable(udc->usb_slv_clk);
 usb_clk_enable_fail:
 pll_set_fail:
         clk_disable(udc->usb_pll_clk);
 pll_enable_fail:
         clk_put(udc->usb_slv_clk);
+usb_otg_clk_get_fail:
+        clk_put(udc->usb_otg_clk);
 usb_clk_get_fail:
         clk_put(udc->usb_pll_clk);
 pll_get_fail:
@@ -3433,6 +3406,8 @@ static int __devexit lpc32xx_udc_remove(struct platform_device *pdev)
 
         device_unregister(&udc->gadget.dev);
 
+        clk_disable(udc->usb_otg_clk);
+        clk_put(udc->usb_otg_clk);
         clk_disable(udc->usb_slv_clk);
         clk_put(udc->usb_slv_clk);
         clk_disable(udc->usb_pll_clk);
@@ -3446,7 +3421,6 @@ static int __devexit lpc32xx_udc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int lpc32xx_udc_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
-        int to = 1000;
         struct lpc32xx_udc *udc = platform_get_drvdata(pdev);
 
         if (udc->clocked) {
@@ -3461,15 +3435,6 @@ static int lpc32xx_udc_suspend(struct platform_device *pdev, pm_message_t mesg)
                    on resume */
                 udc->clocked = 1;
 
-                /* Kill OTG and I2C clocks */
-                writel(0, USB_OTG_CLK_CTRL(udc));
-                while (((readl(USB_OTG_CLK_STAT(udc)) & OTGOFF_CLK_MASK) !=
-                        OTGOFF_CLK_MASK) && (to > 0))
-                        to--;
-                if (!to)
-                        dev_dbg(udc->dev,
-                                "USB OTG clocks not correctly enabled\n");
-
                 /* Kill global USB clock */
                 clk_disable(udc->usb_slv_clk);
         }
diff --git a/drivers/usb/gadget/mv_u3d.h b/drivers/usb/gadget/mv_u3d.h
new file mode 100644
index 000000000000..e32a787ac373
--- /dev/null
+++ b/drivers/usb/gadget/mv_u3d.h
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#ifndef __MV_U3D_H
+#define __MV_U3D_H
+
+#define MV_U3D_EP_CONTEXT_ALIGNMENT     32
+#define MV_U3D_TRB_ALIGNMENT    16
+#define MV_U3D_DMA_BOUNDARY     4096
+#define MV_U3D_EP0_MAX_PKT_SIZE 512
+
+/* ep0 transfer state */
+#define MV_U3D_WAIT_FOR_SETUP           0
+#define MV_U3D_DATA_STATE_XMIT          1
+#define MV_U3D_DATA_STATE_NEED_ZLP      2
+#define MV_U3D_WAIT_FOR_OUT_STATUS      3
+#define MV_U3D_DATA_STATE_RECV          4
+#define MV_U3D_STATUS_STAGE             5
+
+#define MV_U3D_EP_MAX_LENGTH_TRANSFER   0x10000
+
+/* USB3 Interrupt Status */
+#define MV_U3D_USBINT_SETUP             0x00000001
+#define MV_U3D_USBINT_RX_COMPLETE       0x00000002
+#define MV_U3D_USBINT_TX_COMPLETE       0x00000004
+#define MV_U3D_USBINT_UNDER_RUN 0x00000008
+#define MV_U3D_USBINT_RXDESC_ERR        0x00000010
+#define MV_U3D_USBINT_TXDESC_ERR        0x00000020
+#define MV_U3D_USBINT_RX_TRB_COMPLETE   0x00000040
+#define MV_U3D_USBINT_TX_TRB_COMPLETE   0x00000080
+#define MV_U3D_USBINT_VBUS_VALID        0x00010000
+#define MV_U3D_USBINT_STORAGE_CMD_FULL  0x00020000
+#define MV_U3D_USBINT_LINK_CHG          0x01000000
+
+/* USB3 Interrupt Enable */
+#define MV_U3D_INTR_ENABLE_SETUP                0x00000001
+#define MV_U3D_INTR_ENABLE_RX_COMPLETE          0x00000002
+#define MV_U3D_INTR_ENABLE_TX_COMPLETE          0x00000004
+#define MV_U3D_INTR_ENABLE_UNDER_RUN            0x00000008
+#define MV_U3D_INTR_ENABLE_RXDESC_ERR           0x00000010
+#define MV_U3D_INTR_ENABLE_TXDESC_ERR           0x00000020
+#define MV_U3D_INTR_ENABLE_RX_TRB_COMPLETE      0x00000040
+#define MV_U3D_INTR_ENABLE_TX_TRB_COMPLETE      0x00000080
+#define MV_U3D_INTR_ENABLE_RX_BUFFER_ERR        0x00000100
+#define MV_U3D_INTR_ENABLE_VBUS_VALID           0x00010000
+#define MV_U3D_INTR_ENABLE_STORAGE_CMD_FULL     0x00020000
+#define MV_U3D_INTR_ENABLE_LINK_CHG             0x01000000
+#define MV_U3D_INTR_ENABLE_PRIME_STATUS 0x02000000
+
+/* USB3 Link Change */
+#define MV_U3D_LINK_CHANGE_LINK_UP              0x00000001
+#define MV_U3D_LINK_CHANGE_SUSPEND              0x00000002
+#define MV_U3D_LINK_CHANGE_RESUME               0x00000004
+#define MV_U3D_LINK_CHANGE_WRESET               0x00000008
+#define MV_U3D_LINK_CHANGE_HRESET               0x00000010
+#define MV_U3D_LINK_CHANGE_VBUS_INVALID 0x00000020
+#define MV_U3D_LINK_CHANGE_INACT                0x00000040
+#define MV_U3D_LINK_CHANGE_DISABLE_AFTER_U0     0x00000080
+#define MV_U3D_LINK_CHANGE_U1                   0x00000100
+#define MV_U3D_LINK_CHANGE_U2                   0x00000200
+#define MV_U3D_LINK_CHANGE_U3                   0x00000400
+
+/* bridge setting */
+#define MV_U3D_BRIDGE_SETTING_VBUS_VALID        (1 << 16)
+
+/* Command Register Bit Masks */
+#define MV_U3D_CMD_RUN_STOP             0x00000001
+#define MV_U3D_CMD_CTRL_RESET           0x00000002
+
+/* ep control register */
+#define MV_U3D_EPXCR_EP_TYPE_CONTROL            0
+#define MV_U3D_EPXCR_EP_TYPE_ISOC               1
+#define MV_U3D_EPXCR_EP_TYPE_BULK               2
+#define MV_U3D_EPXCR_EP_TYPE_INT                3
+#define MV_U3D_EPXCR_EP_ENABLE_SHIFT            4
+#define MV_U3D_EPXCR_MAX_BURST_SIZE_SHIFT       12
+#define MV_U3D_EPXCR_MAX_PACKET_SIZE_SHIFT      16
+#define MV_U3D_USB_BULK_BURST_OUT               6
+#define MV_U3D_USB_BULK_BURST_IN                14
+
+#define MV_U3D_EPXCR_EP_FLUSH           (1 << 7)
+#define MV_U3D_EPXCR_EP_HALT            (1 << 1)
+#define MV_U3D_EPXCR_EP_INIT            (1)
+
+/* TX/RX Status Register */
+#define MV_U3D_XFERSTATUS_COMPLETE_SHIFT        24
+#define MV_U3D_COMPLETE_INVALID 0
+#define MV_U3D_COMPLETE_SUCCESS 1
+#define MV_U3D_COMPLETE_BUFF_ERR        2
+#define MV_U3D_COMPLETE_SHORT_PACKET    3
+#define MV_U3D_COMPLETE_TRB_ERR 5
+#define MV_U3D_XFERSTATUS_TRB_LENGTH_MASK       (0xFFFFFF)
+
+#define MV_U3D_USB_LINK_BYPASS_VBUS     0x8
+
+#define MV_U3D_LTSSM_PHY_INIT_DONE              0x80000000
+#define MV_U3D_LTSSM_NEVER_GO_COMPLIANCE        0x40000000
+
+#define MV_U3D_USB3_OP_REGS_OFFSET      0x100
+#define MV_U3D_USB3_PHY_OFFSET          0xB800
+
+#define DCS_ENABLE      0x1
+
+/* timeout */
+#define MV_U3D_RESET_TIMEOUT            10000
+#define MV_U3D_FLUSH_TIMEOUT            100000
+#define MV_U3D_OWN_TIMEOUT              10000
+#define LOOPS_USEC_SHIFT        4
+#define LOOPS_USEC              (1 << LOOPS_USEC_SHIFT)
+#define LOOPS(timeout)          ((timeout) >> LOOPS_USEC_SHIFT)
+
+/* ep direction */
+#define MV_U3D_EP_DIR_IN                1
+#define MV_U3D_EP_DIR_OUT               0
+#define mv_u3d_ep_dir(ep)       (((ep)->ep_num == 0) ? \
+                                ((ep)->u3d->ep0_dir) : ((ep)->direction))
+
+/* usb capability registers */
+struct mv_u3d_cap_regs {
+        u32     rsvd[5];
+        u32     dboff;  /* doorbell register offset */
+        u32     rtsoff; /* runtime register offset */
+        u32     vuoff;  /* vendor unique register offset */
+};
+
+/* operation registers */
+struct mv_u3d_op_regs {
+        u32     usbcmd;         /* Command register */
+        u32     rsvd1[11];
+        u32     dcbaapl;        /* Device Context Base Address low register */
+        u32     dcbaaph;        /* Device Context Base Address high register */
+        u32     rsvd2[243];
+        u32     portsc;         /* port status and control register*/
+        u32     portlinkinfo;   /* port link info register*/
+        u32     rsvd3[9917];
+        u32     doorbell;       /* doorbell register */
+};
+
+/* control enpoint enable registers */
+struct epxcr {
+        u32     epxoutcr0;      /* ep out control 0 register */
+        u32     epxoutcr1;      /* ep out control 1 register */
+        u32     epxincr0;       /* ep in control 0 register */
+        u32     epxincr1;       /* ep in control 1 register */
+};
+
+/* transfer status registers */
+struct xferstatus {
+        u32     curdeqlo;       /* current TRB pointer low */
+        u32     curdeqhi;       /* current TRB pointer high */
+        u32     statuslo;       /* transfer status low */
+        u32     statushi;       /* transfer status high */
+};
+
+/* vendor unique control registers */
+struct mv_u3d_vuc_regs {
+        u32     ctrlepenable;   /* control endpoint enable register */
+        u32     setuplock;      /* setup lock register */
+        u32     endcomplete;    /* endpoint transfer complete register */
+        u32     intrcause;      /* interrupt cause register */
+        u32     intrenable;     /* interrupt enable register */
+        u32     trbcomplete;    /* TRB complete register */
+        u32     linkchange;     /* link change register */
+        u32     rsvd1[5];
+        u32     trbunderrun;    /* TRB underrun register */
+        u32     rsvd2[43];
+        u32     bridgesetting;  /* bridge setting register */
+        u32     rsvd3[7];
+        struct xferstatus       txst[16];       /* TX status register */
+        struct xferstatus       rxst[16];       /* RX status register */
+        u32     ltssm;          /* LTSSM control register */
+        u32     pipe;           /* PIPE control register */
+        u32     linkcr0;        /* link control 0 register */
+        u32     linkcr1;        /* link control 1 register */
+        u32     rsvd6[60];
+        u32     mib0;           /* MIB0 counter register */
+        u32     usblink;        /* usb link control register */
+        u32     ltssmstate;     /* LTSSM state register */
+        u32     linkerrorcause; /* link error cause register */
+        u32     rsvd7[60];
+        u32     devaddrtiebrkr; /* device address and tie breaker */
+        u32     itpinfo0;       /* ITP info 0 register */
+        u32     itpinfo1;       /* ITP info 1 register */
+        u32     rsvd8[61];
+        struct epxcr    epcr[16];       /* ep control register */
+        u32     rsvd9[64];
+        u32     phyaddr;        /* PHY address register */
+        u32     phydata;        /* PHY data register */
+};
+
+/* Endpoint context structure */
+struct mv_u3d_ep_context {
+        u32     rsvd0;
+        u32     rsvd1;
+        u32     trb_addr_lo;            /* TRB address low 32 bit */
+        u32     trb_addr_hi;            /* TRB address high 32 bit */
+        u32     rsvd2;
+        u32     rsvd3;
+        struct usb_ctrlrequest setup_buffer;    /* setup data buffer */
+};
+
+/* TRB control data structure */
+struct mv_u3d_trb_ctrl {
+        u32     own:1;          /* owner of TRB */
+        u32     rsvd1:3;
+        u32     chain:1;        /* associate this TRB with the
+                                next TRB on the Ring */
+        u32     ioc:1;          /* interrupt on complete */
+        u32     rsvd2:4;
+        u32     type:6;         /* TRB type */
+#define TYPE_NORMAL     1
+#define TYPE_DATA       3
+#define TYPE_LINK       6
+        u32     dir:1;          /* Working at data stage of control endpoint
+                                operation. 0 is OUT and 1 is IN. */
+        u32     rsvd3:15;
+};
+
+/* TRB data structure
+ * For multiple TRB, all the TRBs' physical address should be continuous.
+ */
+struct mv_u3d_trb_hw {
+        u32     buf_addr_lo;    /* data buffer address low 32 bit */
+        u32     buf_addr_hi;    /* data buffer address high 32 bit */
+        u32     trb_len;        /* transfer length */
+        struct mv_u3d_trb_ctrl  ctrl;   /* TRB control data */
+};
+
+/* TRB structure */
+struct mv_u3d_trb {
+        struct mv_u3d_trb_hw *trb_hw;   /* point to the trb_hw structure */
+        dma_addr_t trb_dma;             /* dma address for this trb_hw */
+        struct list_head trb_list;      /* trb list */
+};
+
+/* device data structure */
+struct mv_u3d {
+        struct usb_gadget               gadget;
+        struct usb_gadget_driver        *driver;
+        spinlock_t                      lock;   /* device lock */
+        struct completion               *done;
+        struct device                   *dev;
+        int                             irq;
+
+        /* usb controller registers */
+        struct mv_u3d_cap_regs __iomem  *cap_regs;
+        struct mv_u3d_op_regs __iomem   *op_regs;
+        struct mv_u3d_vuc_regs __iomem  *vuc_regs;
+        void __iomem                    *phy_regs;
+
+        unsigned int                    max_eps;
+        struct mv_u3d_ep_context        *ep_context;
+        size_t                          ep_context_size;
+        dma_addr_t                      ep_context_dma;
+
+        struct dma_pool                 *trb_pool; /* for TRB data structure */
+        struct mv_u3d_ep                *eps;
+
+        struct mv_u3d_req               *status_req; /* ep0 status request */
+        struct usb_ctrlrequest          local_setup_buff; /* store setup data*/
+
+        unsigned int            resume_state;   /* USB state to resume */
+        unsigned int            usb_state;      /* USB current state */
+        unsigned int            ep0_state;      /* Endpoint zero state */
+        unsigned int            ep0_dir;
+
+        unsigned int            dev_addr;       /* device address */
+
+        unsigned int            errors;
+
+        unsigned                softconnect:1;
+        unsigned                vbus_active:1;  /* vbus is active or not */
+        unsigned                remote_wakeup:1; /* support remote wakeup */
+        unsigned                clock_gating:1; /* clock gating or not */
+        unsigned                active:1;       /* udc is active or not */
+        unsigned                vbus_valid_detect:1; /* udc vbus detection */
+
+        struct mv_usb_addon_irq *vbus;
+        unsigned int            power;
+
+        struct clk              *clk;
+};
+
+/* endpoint data structure */
+struct mv_u3d_ep {
+        struct usb_ep           ep;
+        struct mv_u3d           *u3d;
+        struct list_head        queue;  /* ep request queued hardware */
+        struct list_head        req_list; /* list of ep request */
+        struct mv_u3d_ep_context        *ep_context; /* ep context */
+        u32                     direction;
+        char                    name[14];
+        u32                     processing; /* there is ep request
+                                                queued on haredware */
+        spinlock_t              req_lock; /* ep lock */
+        unsigned                wedge:1;
+        unsigned                enabled:1;
+        unsigned                ep_type:2;
+        unsigned                ep_num:8;
+};
+
+/* request data structure */
+struct mv_u3d_req {
+        struct usb_request      req;
+        struct mv_u3d_ep        *ep;
+        struct list_head        queue;  /* ep requst queued on hardware */
+        struct list_head        list;   /* ep request list */
+        struct list_head        trb_list; /* trb list of a request */
+
+        struct mv_u3d_trb       *trb_head; /* point to first trb of a request */
+        unsigned                trb_count; /* TRB number in the chain */
+        unsigned                chain;     /* TRB chain or not */
+};
+
+#endif
diff --git a/drivers/usb/gadget/mv_u3d_core.c b/drivers/usb/gadget/mv_u3d_core.c
new file mode 100644
index 000000000000..8cfd5b028dbd
--- /dev/null
+++ b/drivers/usb/gadget/mv_u3d_core.c
@@ -0,0 +1,2098 @@
+/*
+ * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/dma-mapping.h>
+#include <linux/dmapool.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/ioport.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/timer.h>
+#include <linux/list.h>
+#include <linux/notifier.h>
+#include <linux/interrupt.h>
+#include <linux/moduleparam.h>
+#include <linux/device.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
+#include <linux/pm.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/mv_usb.h>
+#include <linux/clk.h>
+#include <asm/system.h>
+#include <asm/unaligned.h>
+#include <asm/byteorder.h>
+
+#include "mv_u3d.h"
+
+#define DRIVER_DESC             "Marvell PXA USB3.0 Device Controller driver"
+
+static const char driver_name[] = "mv_u3d";
+static const char driver_desc[] = DRIVER_DESC;
+
+static void mv_u3d_nuke(struct mv_u3d_ep *ep, int status);
+static void mv_u3d_stop_activity(struct mv_u3d *u3d,
+                        struct usb_gadget_driver *driver);
+
+/* for endpoint 0 operations */
+static const struct usb_endpoint_descriptor mv_u3d_ep0_desc = {
+        .bLength =              USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType =      USB_DT_ENDPOINT,
+        .bEndpointAddress =     0,
+        .bmAttributes =         USB_ENDPOINT_XFER_CONTROL,
+        .wMaxPacketSize =       MV_U3D_EP0_MAX_PKT_SIZE,
+};
+
+static void mv_u3d_ep0_reset(struct mv_u3d *u3d)
+{
+        struct mv_u3d_ep *ep;
+        u32 epxcr;
+        int i;
+
+        for (i = 0; i < 2; i++) {
+                ep = &u3d->eps[i];
+                ep->u3d = u3d;
+
+                /* ep0 ep context, ep0 in and out share the same ep context */
+                ep->ep_context = &u3d->ep_context[1];
+        }
+
+        /* reset ep state machine */
+        /* reset ep0 out */
+        epxcr = ioread32(&u3d->vuc_regs->epcr[0].epxoutcr0);
+        epxcr |= MV_U3D_EPXCR_EP_INIT;
+        iowrite32(epxcr, &u3d->vuc_regs->epcr[0].epxoutcr0);
+        udelay(5);
+        epxcr &= ~MV_U3D_EPXCR_EP_INIT;
+        iowrite32(epxcr, &u3d->vuc_regs->epcr[0].epxoutcr0);
+
+        epxcr = ((MV_U3D_EP0_MAX_PKT_SIZE
+                << MV_U3D_EPXCR_MAX_PACKET_SIZE_SHIFT)
+                | (1 << MV_U3D_EPXCR_MAX_BURST_SIZE_SHIFT)
+                | (1 << MV_U3D_EPXCR_EP_ENABLE_SHIFT)
+                | MV_U3D_EPXCR_EP_TYPE_CONTROL);
+        iowrite32(epxcr, &u3d->vuc_regs->epcr[0].epxoutcr1);
+
+        /* reset ep0 in */
+        epxcr = ioread32(&u3d->vuc_regs->epcr[0].epxincr0);
+        epxcr |= MV_U3D_EPXCR_EP_INIT;
+        iowrite32(epxcr, &u3d->vuc_regs->epcr[0].epxincr0);
+        udelay(5);
+        epxcr &= ~MV_U3D_EPXCR_EP_INIT;
+        iowrite32(epxcr, &u3d->vuc_regs->epcr[0].epxincr0);
+
+        epxcr = ((MV_U3D_EP0_MAX_PKT_SIZE
+                << MV_U3D_EPXCR_MAX_PACKET_SIZE_SHIFT)
+                | (1 << MV_U3D_EPXCR_MAX_BURST_SIZE_SHIFT)
+                | (1 << MV_U3D_EPXCR_EP_ENABLE_SHIFT)
+                | MV_U3D_EPXCR_EP_TYPE_CONTROL);
+        iowrite32(epxcr, &u3d->vuc_regs->epcr[0].epxincr1);
+}
+
+static void mv_u3d_ep0_stall(struct mv_u3d *u3d)
+{
+        u32 tmp;
+        dev_dbg(u3d->dev, "%s\n", __func__);
+
+        /* set TX and RX to stall */
+        tmp = ioread32(&u3d->vuc_regs->epcr[0].epxoutcr0);
+        tmp |= MV_U3D_EPXCR_EP_HALT;
+        iowrite32(tmp, &u3d->vuc_regs->epcr[0].epxoutcr0);
+
+        tmp = ioread32(&u3d->vuc_regs->epcr[0].epxincr0);
+        tmp |= MV_U3D_EPXCR_EP_HALT;
+        iowrite32(tmp, &u3d->vuc_regs->epcr[0].epxincr0);
+
+        /* update ep0 state */
+        u3d->ep0_state = MV_U3D_WAIT_FOR_SETUP;
+        u3d->ep0_dir = MV_U3D_EP_DIR_OUT;
+}
+
+static int mv_u3d_process_ep_req(struct mv_u3d *u3d, int index,
+        struct mv_u3d_req *curr_req)
+{
+        struct mv_u3d_trb       *curr_trb;
+        dma_addr_t cur_deq_lo;
+        struct mv_u3d_ep_context        *curr_ep_context;
+        int trb_complete, actual, remaining_length;
+        int direction, ep_num;
+        int retval = 0;
+        u32 tmp, status, length;
+
+        curr_ep_context = &u3d->ep_context[index];
+        direction = index % 2;
+        ep_num = index / 2;
+
+        trb_complete = 0;
+        actual = curr_req->req.length;
+
+        while (!list_empty(&curr_req->trb_list)) {
+                curr_trb = list_entry(curr_req->trb_list.next,
+                                        struct mv_u3d_trb, trb_list);
+                if (!curr_trb->trb_hw->ctrl.own) {
+                        dev_err(u3d->dev, "%s, TRB own error!\n",
+                                u3d->eps[index].name);
+                        return 1;
+                }
+
+                curr_trb->trb_hw->ctrl.own = 0;
+                if (direction == MV_U3D_EP_DIR_OUT) {
+                        tmp = ioread32(&u3d->vuc_regs->rxst[ep_num].statuslo);
+                        cur_deq_lo =
+                                ioread32(&u3d->vuc_regs->rxst[ep_num].curdeqlo);
+                } else {
+                        tmp = ioread32(&u3d->vuc_regs->txst[ep_num].statuslo);
+                        cur_deq_lo =
+                                ioread32(&u3d->vuc_regs->txst[ep_num].curdeqlo);
+                }
+
+                status = tmp >> MV_U3D_XFERSTATUS_COMPLETE_SHIFT;
+                length = tmp & MV_U3D_XFERSTATUS_TRB_LENGTH_MASK;
+
+                if (status == MV_U3D_COMPLETE_SUCCESS ||
+                        (status == MV_U3D_COMPLETE_SHORT_PACKET &&
+                        direction == MV_U3D_EP_DIR_OUT)) {
+                        remaining_length += length;
+                        actual -= remaining_length;
+                } else {
+                        dev_err(u3d->dev,
+                                "complete_tr error: ep=%d %s: error = 0x%x\n",
+                                index >> 1, direction ? "SEND" : "RECV",
+                                status);
+                        retval = -EPROTO;
+                }
+
+                list_del_init(&curr_trb->trb_list);
+        }
+        if (retval)
+                return retval;
+
+        curr_req->req.actual = actual;
+        return 0;
+}
+
+/*
+ * mv_u3d_done() - retire a request; caller blocked irqs
+ * @status : request status to be set, only works when
+ * request is still in progress.
+ */
+static
+void mv_u3d_done(struct mv_u3d_ep *ep, struct mv_u3d_req *req, int status)
+{
+        struct mv_u3d *u3d = (struct mv_u3d *)ep->u3d;
+
+        dev_dbg(u3d->dev, "mv_u3d_done: remove req->queue\n");
+        /* Removed the req from ep queue */
+        list_del_init(&req->queue);
+
+        /* req.status should be set as -EINPROGRESS in ep_queue() */
+        if (req->req.status == -EINPROGRESS)
+                req->req.status = status;
+        else
+                status = req->req.status;
+
+        /* Free trb for the request */
+        if (!req->chain)
+                dma_pool_free(u3d->trb_pool,
+                        req->trb_head->trb_hw, req->trb_head->trb_dma);
+        else {
+                dma_unmap_single(ep->u3d->gadget.dev.parent,
+                        (dma_addr_t)req->trb_head->trb_dma,
+                        req->trb_count * sizeof(struct mv_u3d_trb_hw),
+                        DMA_BIDIRECTIONAL);
+                kfree(req->trb_head->trb_hw);
+        }
+        kfree(req->trb_head);
+
+        usb_gadget_unmap_request(&u3d->gadget, &req->req, mv_u3d_ep_dir(ep));
+
+        if (status && (status != -ESHUTDOWN)) {
+                dev_dbg(u3d->dev, "complete %s req %p stat %d len %u/%u",
+                        ep->ep.name, &req->req, status,
+                        req->req.actual, req->req.length);
+        }
+
+        spin_unlock(&ep->u3d->lock);
+        /*
+         * complete() is from gadget layer,
+         * eg fsg->bulk_in_complete()
+         */
+        if (req->req.complete)
+                req->req.complete(&ep->ep, &req->req);
+
+        spin_lock(&ep->u3d->lock);
+}
+
+static int mv_u3d_queue_trb(struct mv_u3d_ep *ep, struct mv_u3d_req *req)
+{
+        u32 tmp, direction;
+        struct mv_u3d *u3d;
+        struct mv_u3d_ep_context *ep_context;
+        int retval = 0;
+
+        u3d = ep->u3d;
+        direction = mv_u3d_ep_dir(ep);
+
+        /* ep0 in and out share the same ep context slot 1*/
+        if (ep->ep_num == 0)
+                ep_context = &(u3d->ep_context[1]);
+        else
+                ep_context = &(u3d->ep_context[ep->ep_num * 2 + direction]);
+
+        /* check if the pipe is empty or not */
+        if (!list_empty(&ep->queue)) {
+                dev_err(u3d->dev, "add trb to non-empty queue!\n");
+                retval = -ENOMEM;
+                WARN_ON(1);
+        } else {
+                ep_context->rsvd0 = cpu_to_le32(1);
+                ep_context->rsvd1 = 0;
+
+                /* Configure the trb address and set the DCS bit.
+                 * Both DCS bit and own bit in trb should be set.
+                 */
+                ep_context->trb_addr_lo =
+                        cpu_to_le32(req->trb_head->trb_dma | DCS_ENABLE);
+                ep_context->trb_addr_hi = 0;
+
+                /* Ensure that updates to the EP Context will
+                 * occure before Ring Bell.
+                 */
+                wmb();
+
+                /* ring bell the ep */
+                if (ep->ep_num == 0)
+                        tmp = 0x1;
+                else
+                        tmp = ep->ep_num * 2
+                                + ((direction == MV_U3D_EP_DIR_OUT) ? 0 : 1);
+
+                iowrite32(tmp, &u3d->op_regs->doorbell);
+        }
+        return retval;
+}
+
+static struct mv_u3d_trb *mv_u3d_build_trb_one(struct mv_u3d_req *req,
+                                unsigned *length, dma_addr_t *dma)
+{
+        u32 temp;
+        unsigned int direction;
+        struct mv_u3d_trb *trb;
+        struct mv_u3d_trb_hw *trb_hw;
+        struct mv_u3d *u3d;
+
+        /* how big will this transfer be? */
+        *length = req->req.length - req->req.actual;
+        BUG_ON(*length > (unsigned)MV_U3D_EP_MAX_LENGTH_TRANSFER);
+
+        u3d = req->ep->u3d;
+
+        trb = kzalloc(sizeof(*trb), GFP_ATOMIC);
+        if (!trb) {
+                dev_err(u3d->dev, "%s, trb alloc fail\n", __func__);
+                return NULL;
+        }
+
+        /*
+         * Be careful that no _GFP_HIGHMEM is set,
+         * or we can not use dma_to_virt
+         * cannot use GFP_KERNEL in spin lock
+         */
+        trb_hw = dma_pool_alloc(u3d->trb_pool, GFP_ATOMIC, dma);
+        if (!trb_hw) {
+                dev_err(u3d->dev,
+                        "%s, dma_pool_alloc fail\n", __func__);
+                return NULL;
+        }
+        trb->trb_dma = *dma;
+        trb->trb_hw = trb_hw;
+
+        /* initialize buffer page pointers */
+        temp = (u32)(req->req.dma + req->req.actual);
+
+        trb_hw->buf_addr_lo = cpu_to_le32(temp);
+        trb_hw->buf_addr_hi = 0;
+        trb_hw->trb_len = cpu_to_le32(*length);
+        trb_hw->ctrl.own = 1;
+
+        if (req->ep->ep_num == 0)
+                trb_hw->ctrl.type = TYPE_DATA;
+        else
+                trb_hw->ctrl.type = TYPE_NORMAL;
+
+        req->req.actual += *length;
+
+        direction = mv_u3d_ep_dir(req->ep);
+        if (direction == MV_U3D_EP_DIR_IN)
+                trb_hw->ctrl.dir = 1;
+        else
+                trb_hw->ctrl.dir = 0;
+
+        /* Enable interrupt for the last trb of a request */
+        if (!req->req.no_interrupt)
+                trb_hw->ctrl.ioc = 1;
+
+        trb_hw->ctrl.chain = 0;
+
+        wmb();
+        return trb;
+}
+
+static int mv_u3d_build_trb_chain(struct mv_u3d_req *req, unsigned *length,
+                struct mv_u3d_trb *trb, int *is_last)
+{
+        u32 temp;
+        unsigned int direction;
+        struct mv_u3d *u3d;
+
+        /* how big will this transfer be? */
+        *length = min(req->req.length - req->req.actual,
+                        (unsigned)MV_U3D_EP_MAX_LENGTH_TRANSFER);
+
+        u3d = req->ep->u3d;
+
+        trb->trb_dma = 0;
+
+        /* initialize buffer page pointers */
+        temp = (u32)(req->req.dma + req->req.actual);
+
+        trb->trb_hw->buf_addr_lo = cpu_to_le32(temp);
+        trb->trb_hw->buf_addr_hi = 0;
+        trb->trb_hw->trb_len = cpu_to_le32(*length);
+        trb->trb_hw->ctrl.own = 1;
+
+        if (req->ep->ep_num == 0)
+                trb->trb_hw->ctrl.type = TYPE_DATA;
+        else
+                trb->trb_hw->ctrl.type = TYPE_NORMAL;
+
+        req->req.actual += *length;
+
+        direction = mv_u3d_ep_dir(req->ep);
+        if (direction == MV_U3D_EP_DIR_IN)
+                trb->trb_hw->ctrl.dir = 1;
+        else
+                trb->trb_hw->ctrl.dir = 0;
+
+        /* zlp is needed if req->req.zero is set */
+        if (req->req.zero) {
+                if (*length == 0 || (*length % req->ep->ep.maxpacket) != 0)
+                        *is_last = 1;
+                else
+                        *is_last = 0;
+        } else if (req->req.length == req->req.actual)
+                *is_last = 1;
+        else
+                *is_last = 0;
+
+        /* Enable interrupt for the last trb of a request */
+        if (*is_last && !req->req.no_interrupt)
+                trb->trb_hw->ctrl.ioc = 1;
+
+        if (*is_last)
+                trb->trb_hw->ctrl.chain = 0;
+        else {
+                trb->trb_hw->ctrl.chain = 1;
+                dev_dbg(u3d->dev, "chain trb\n");
+        }
+
+        wmb();
+
+        return 0;
+}
+
+/* generate TRB linked list for a request
+ * usb controller only supports continous trb chain,
+ * that trb structure physical address should be continous.
+ */
+static int mv_u3d_req_to_trb(struct mv_u3d_req *req)
+{
+        unsigned count;
+        int is_last;
+        struct mv_u3d_trb *trb;
+        struct mv_u3d_trb_hw *trb_hw;
+        struct mv_u3d *u3d;
+        dma_addr_t dma;
+        unsigned length;
+        unsigned trb_num;
+
+        u3d = req->ep->u3d;
+
+        INIT_LIST_HEAD(&req->trb_list);
+
+        length = req->req.length - req->req.actual;
+        /* normally the request transfer length is less than 16KB.
+         * we use buil_trb_one() to optimize it.
+         */
+        if (length <= (unsigned)MV_U3D_EP_MAX_LENGTH_TRANSFER) {
+                trb = mv_u3d_build_trb_one(req, &count, &dma);
+                list_add_tail(&trb->trb_list, &req->trb_list);
+                req->trb_head = trb;
+                req->trb_count = 1;
+                req->chain = 0;
+        } else {
+                trb_num = length / MV_U3D_EP_MAX_LENGTH_TRANSFER;
+                if (length % MV_U3D_EP_MAX_LENGTH_TRANSFER)
+                        trb_num++;
+
+                trb = kcalloc(trb_num, sizeof(*trb), GFP_ATOMIC);
+                if (!trb) {
+                        dev_err(u3d->dev,
+                                        "%s, trb alloc fail\n", __func__);
+                        return -ENOMEM;
+                }
+
+                trb_hw = kcalloc(trb_num, sizeof(*trb_hw), GFP_ATOMIC);
+                if (!trb_hw) {
+                        dev_err(u3d->dev,
+                                        "%s, trb_hw alloc fail\n", __func__);
+                        return -ENOMEM;
+                }
+
+                do {
+                        trb->trb_hw = trb_hw;
+                        if (mv_u3d_build_trb_chain(req, &count,
+                                                trb, &is_last)) {
+                                dev_err(u3d->dev,
+                                        "%s, mv_u3d_build_trb_chain fail\n",
+                                        __func__);
+                                return -EIO;
+                        }
+
+                        list_add_tail(&trb->trb_list, &req->trb_list);
+                        req->trb_count++;
+                        trb++;
+                        trb_hw++;
+                } while (!is_last);
+
+                req->trb_head = list_entry(req->trb_list.next,
+                                        struct mv_u3d_trb, trb_list);
+                req->trb_head->trb_dma = dma_map_single(u3d->gadget.dev.parent,
+                                        req->trb_head->trb_hw,
+                                        trb_num * sizeof(*trb_hw),
+                                        DMA_BIDIRECTIONAL);
+
+                req->chain = 1;
+        }
+
+        return 0;
+}
+
+static int
+mv_u3d_start_queue(struct mv_u3d_ep *ep)
+{
+        struct mv_u3d *u3d = ep->u3d;
+        struct mv_u3d_req *req;
+        int ret;
+
+        if (!list_empty(&ep->req_list) && !ep->processing)
+                req = list_entry(ep->req_list.next, struct mv_u3d_req, list);
+        else
+                return 0;
+
+        ep->processing = 1;
+
+        /* set up dma mapping */
+        ret = usb_gadget_map_request(&u3d->gadget, &req->req,
+                                        mv_u3d_ep_dir(ep));
+        if (ret)
+                return ret;
+
+        req->req.status = -EINPROGRESS;
+        req->req.actual = 0;
+        req->trb_count = 0;
+
+        /* build trbs and push them to device queue */
+        if (!mv_u3d_req_to_trb(req)) {
+                ret = mv_u3d_queue_trb(ep, req);
+                if (ret) {
+                        ep->processing = 0;
+                        return ret;
+                }
+        } else {
+                ep->processing = 0;
+                dev_err(u3d->dev, "%s, mv_u3d_req_to_trb fail\n", __func__);
+                return -ENOMEM;
+        }
+
+        /* irq handler advances the queue */
+        if (req)
+                list_add_tail(&req->queue, &ep->queue);
+
+        return 0;
+}
+
+static int mv_u3d_ep_enable(struct usb_ep *_ep,
+                const struct usb_endpoint_descriptor *desc)
+{
+        struct mv_u3d *u3d;
+        struct mv_u3d_ep *ep;
+        struct mv_u3d_ep_context *ep_context;
+        u16 max = 0;
+        unsigned maxburst = 0;
+        u32 epxcr, direction;
+
+        if (!_ep || !desc || desc->bDescriptorType != USB_DT_ENDPOINT)
+                return -EINVAL;
+
+        ep = container_of(_ep, struct mv_u3d_ep, ep);
+        u3d = ep->u3d;
+
+        if (!u3d->driver || u3d->gadget.speed == USB_SPEED_UNKNOWN)
+                return -ESHUTDOWN;
+
+        direction = mv_u3d_ep_dir(ep);
+        max = le16_to_cpu(desc->wMaxPacketSize);
+
+        if (!_ep->maxburst)
+                _ep->maxburst = 1;
+        maxburst = _ep->maxburst;
+
+        /* Get the endpoint context address */
+        ep_context = (struct mv_u3d_ep_context *)ep->ep_context;
+
+        /* Set the max burst size */
+        switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) {
+        case USB_ENDPOINT_XFER_BULK:
+                if (maxburst > 16) {
+                        dev_dbg(u3d->dev,
+                                "max burst should not be greater "
+                                "than 16 on bulk ep\n");
+                        maxburst = 1;
+                        _ep->maxburst = maxburst;
+                }
+                dev_dbg(u3d->dev,
+                        "maxburst: %d on bulk %s\n", maxburst, ep->name);
+                break;
+        case USB_ENDPOINT_XFER_CONTROL:
+                /* control transfer only supports maxburst as one */
+                maxburst = 1;
+                _ep->maxburst = maxburst;
+                break;
+        case USB_ENDPOINT_XFER_INT:
+                if (maxburst != 1) {
+                        dev_dbg(u3d->dev,
+                                "max burst should be 1 on int ep "
+                                "if transfer size is not 1024\n");
+                        maxburst = 1;
+                        _ep->maxburst = maxburst;
+                }
+                break;
+        case USB_ENDPOINT_XFER_ISOC:
+                if (maxburst != 1) {
+                        dev_dbg(u3d->dev,
+                                "max burst should be 1 on isoc ep "
+                                "if transfer size is not 1024\n");
+                        maxburst = 1;
+                        _ep->maxburst = maxburst;
+                }
+                break;
+        default:
+                goto en_done;
+        }
+
+        ep->ep.maxpacket = max;
+        ep->ep.desc = desc;
+        ep->enabled = 1;
+
+        /* Enable the endpoint for Rx or Tx and set the endpoint type */
+        if (direction == MV_U3D_EP_DIR_OUT) {
+                epxcr = ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxoutcr0);
+                epxcr |= MV_U3D_EPXCR_EP_INIT;
+                iowrite32(epxcr, &u3d->vuc_regs->epcr[ep->ep_num].epxoutcr0);
+                udelay(5);
+                epxcr &= ~MV_U3D_EPXCR_EP_INIT;
+                iowrite32(epxcr, &u3d->vuc_regs->epcr[ep->ep_num].epxoutcr0);
+
+                epxcr = ((max << MV_U3D_EPXCR_MAX_PACKET_SIZE_SHIFT)
+                      | ((maxburst - 1) << MV_U3D_EPXCR_MAX_BURST_SIZE_SHIFT)
+                      | (1 << MV_U3D_EPXCR_EP_ENABLE_SHIFT)
+                      | (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK));
+                iowrite32(epxcr, &u3d->vuc_regs->epcr[ep->ep_num].epxoutcr1);
+        } else {
+                epxcr = ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxincr0);
+                epxcr |= MV_U3D_EPXCR_EP_INIT;
+                iowrite32(epxcr, &u3d->vuc_regs->epcr[ep->ep_num].epxincr0);
+                udelay(5);
+                epxcr &= ~MV_U3D_EPXCR_EP_INIT;
+                iowrite32(epxcr, &u3d->vuc_regs->epcr[ep->ep_num].epxincr0);
+
+                epxcr = ((max << MV_U3D_EPXCR_MAX_PACKET_SIZE_SHIFT)
+                      | ((maxburst - 1) << MV_U3D_EPXCR_MAX_BURST_SIZE_SHIFT)
+                      | (1 << MV_U3D_EPXCR_EP_ENABLE_SHIFT)
+                      | (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK));
+                iowrite32(epxcr, &u3d->vuc_regs->epcr[ep->ep_num].epxincr1);
+        }
+
+        return 0;
+en_done:
+        return -EINVAL;
+}
+
+static int  mv_u3d_ep_disable(struct usb_ep *_ep)
+{
+        struct mv_u3d *u3d;
+        struct mv_u3d_ep *ep;
+        struct mv_u3d_ep_context *ep_context;
+        u32 epxcr, direction;
+
+        if (!_ep)
+                return -EINVAL;
+
+        ep = container_of(_ep, struct mv_u3d_ep, ep);
+        if (!ep->ep.desc)
+                return -EINVAL;
+
+        u3d = ep->u3d;
+
+        /* Get the endpoint context address */
+        ep_context = ep->ep_context;
+
+        direction = mv_u3d_ep_dir(ep);
+
+        /* nuke all pending requests (does flush) */
+        mv_u3d_nuke(ep, -ESHUTDOWN);
+
+        /* Disable the endpoint for Rx or Tx and reset the endpoint type */
+        if (direction == MV_U3D_EP_DIR_OUT) {
+                epxcr = ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxoutcr1);
+                epxcr &= ~((1 << MV_U3D_EPXCR_EP_ENABLE_SHIFT)
+                      | USB_ENDPOINT_XFERTYPE_MASK);
+                iowrite32(epxcr, &u3d->vuc_regs->epcr[ep->ep_num].epxoutcr1);
+        } else {
+                epxcr = ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxincr1);
+                epxcr &= ~((1 << MV_U3D_EPXCR_EP_ENABLE_SHIFT)
+                      | USB_ENDPOINT_XFERTYPE_MASK);
+                iowrite32(epxcr, &u3d->vuc_regs->epcr[ep->ep_num].epxincr1);
+        }
+
+        ep->enabled = 0;
+
+        ep->ep.desc = NULL;
+        return 0;
+}
+
+static struct usb_request *
+mv_u3d_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
+{
+        struct mv_u3d_req *req = NULL;
+
+        req = kzalloc(sizeof *req, gfp_flags);
+        if (!req)
+                return NULL;
+
+        INIT_LIST_HEAD(&req->queue);
+
+        return &req->req;
+}
+
+static void mv_u3d_free_request(struct usb_ep *_ep, struct usb_request *_req)
+{
+        struct mv_u3d_req *req = container_of(_req, struct mv_u3d_req, req);
+
+        kfree(req);
+}
+
+static void mv_u3d_ep_fifo_flush(struct usb_ep *_ep)
+{
+        struct mv_u3d *u3d;
+        u32 direction;
+        struct mv_u3d_ep *ep = container_of(_ep, struct mv_u3d_ep, ep);
+        unsigned int loops;
+        u32 tmp;
+
+        /* if endpoint is not enabled, cannot flush endpoint */
+        if (!ep->enabled)
+                return;
+
+        u3d = ep->u3d;
+        direction = mv_u3d_ep_dir(ep);
+
+        /* ep0 need clear bit after flushing fifo. */
+        if (!ep->ep_num) {
+                if (direction == MV_U3D_EP_DIR_OUT) {
+                        tmp = ioread32(&u3d->vuc_regs->epcr[0].epxoutcr0);
+                        tmp |= MV_U3D_EPXCR_EP_FLUSH;
+                        iowrite32(tmp, &u3d->vuc_regs->epcr[0].epxoutcr0);
+                        udelay(10);
+                        tmp &= ~MV_U3D_EPXCR_EP_FLUSH;
+                        iowrite32(tmp, &u3d->vuc_regs->epcr[0].epxoutcr0);
+                } else {
+                        tmp = ioread32(&u3d->vuc_regs->epcr[0].epxincr0);
+                        tmp |= MV_U3D_EPXCR_EP_FLUSH;
+                        iowrite32(tmp, &u3d->vuc_regs->epcr[0].epxincr0);
+                        udelay(10);
+                        tmp &= ~MV_U3D_EPXCR_EP_FLUSH;
+                        iowrite32(tmp, &u3d->vuc_regs->epcr[0].epxincr0);
+                }
+                return;
+        }
+
+        if (direction == MV_U3D_EP_DIR_OUT) {
+                tmp = ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxoutcr0);
+                tmp |= MV_U3D_EPXCR_EP_FLUSH;
+                iowrite32(tmp, &u3d->vuc_regs->epcr[ep->ep_num].epxoutcr0);
+
+                /* Wait until flushing completed */
+                loops = LOOPS(MV_U3D_FLUSH_TIMEOUT);
+                while (ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxoutcr0) &
+                        MV_U3D_EPXCR_EP_FLUSH) {
+                        /*
+                         * EP_FLUSH bit should be cleared to indicate this
+                         * operation is complete
+                         */
+                        if (loops == 0) {
+                                dev_dbg(u3d->dev,
+                                    "EP FLUSH TIMEOUT for ep%d%s\n", ep->ep_num,
+                                    direction ? "in" : "out");
+                                return;
+                        }
+                        loops--;
+                        udelay(LOOPS_USEC);
+                }
+        } else {        /* EP_DIR_IN */
+                tmp = ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxincr0);
+                tmp |= MV_U3D_EPXCR_EP_FLUSH;
+                iowrite32(tmp, &u3d->vuc_regs->epcr[ep->ep_num].epxincr0);
+
+                /* Wait until flushing completed */
+                loops = LOOPS(MV_U3D_FLUSH_TIMEOUT);
+                while (ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxincr0) &
+                        MV_U3D_EPXCR_EP_FLUSH) {
+                        /*
+                        * EP_FLUSH bit should be cleared to indicate this
+                        * operation is complete
+                        */
+                        if (loops == 0) {
+                                dev_dbg(u3d->dev,
+                                    "EP FLUSH TIMEOUT for ep%d%s\n", ep->ep_num,
+                                    direction ? "in" : "out");
+                                return;
+                        }
+                        loops--;
+                        udelay(LOOPS_USEC);
+                }
+        }
+}
+
+/* queues (submits) an I/O request to an endpoint */
+static int
+mv_u3d_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
+{
+        struct mv_u3d_ep *ep;
+        struct mv_u3d_req *req;
+        struct mv_u3d *u3d;
+        unsigned long flags;
+        int is_first_req = 0;
+
+        if (unlikely(!_ep || !_req))
+                return -EINVAL;
+
+        ep = container_of(_ep, struct mv_u3d_ep, ep);
+        u3d = ep->u3d;
+
+        req = container_of(_req, struct mv_u3d_req, req);
+
+        if (!ep->ep_num
+                && u3d->ep0_state == MV_U3D_STATUS_STAGE
+                && !_req->length) {
+                dev_dbg(u3d->dev, "ep0 status stage\n");
+                u3d->ep0_state = MV_U3D_WAIT_FOR_SETUP;
+                return 0;
+        }
+
+        dev_dbg(u3d->dev, "%s: %s, req: 0x%x\n",
+                        __func__, _ep->name, (u32)req);
+
+        /* catch various bogus parameters */
+        if (!req->req.complete || !req->req.buf
+                        || !list_empty(&req->queue)) {
+                dev_err(u3d->dev,
+                        "%s, bad params, _req: 0x%x,"
+                        "req->req.complete: 0x%x, req->req.buf: 0x%x,"
+                        "list_empty: 0x%x\n",
+                        __func__, (u32)_req,
+                        (u32)req->req.complete, (u32)req->req.buf,
+                        (u32)list_empty(&req->queue));
+                return -EINVAL;
+        }
+        if (unlikely(!ep->ep.desc)) {
+                dev_err(u3d->dev, "%s, bad ep\n", __func__);
+                return -EINVAL;
+        }
+        if (ep->ep.desc->bmAttributes == USB_ENDPOINT_XFER_ISOC) {
+                if (req->req.length > ep->ep.maxpacket)
+                        return -EMSGSIZE;
+        }
+
+        if (!u3d->driver || u3d->gadget.speed == USB_SPEED_UNKNOWN) {
+                dev_err(u3d->dev,
+                        "bad params of driver/speed\n");
+                return -ESHUTDOWN;
+        }
+
+        req->ep = ep;
+
+        /* Software list handles usb request. */
+        spin_lock_irqsave(&ep->req_lock, flags);
+        is_first_req = list_empty(&ep->req_list);
+        list_add_tail(&req->list, &ep->req_list);
+        spin_unlock_irqrestore(&ep->req_lock, flags);
+        if (!is_first_req) {
+                dev_dbg(u3d->dev, "list is not empty\n");
+                return 0;
+        }
+
+        dev_dbg(u3d->dev, "call mv_u3d_start_queue from usb_ep_queue\n");
+        spin_lock_irqsave(&u3d->lock, flags);
+        mv_u3d_start_queue(ep);
+        spin_unlock_irqrestore(&u3d->lock, flags);
+        return 0;
+}
+
+/* dequeues (cancels, unlinks) an I/O request from an endpoint */
+static int mv_u3d_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
+{
+        struct mv_u3d_ep *ep;
+        struct mv_u3d_req *req;
+        struct mv_u3d *u3d;
+        struct mv_u3d_ep_context *ep_context;
+        struct mv_u3d_req *next_req;
+
+        unsigned long flags;
+        int ret = 0;
+
+        if (!_ep || !_req)
+                return -EINVAL;
+
+        ep = container_of(_ep, struct mv_u3d_ep, ep);
+        u3d = ep->u3d;
+
+        spin_lock_irqsave(&ep->u3d->lock, flags);
+
+        /* make sure it's actually queued on this endpoint */
+        list_for_each_entry(req, &ep->queue, queue) {
+                if (&req->req == _req)
+                        break;
+        }
+        if (&req->req != _req) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        /* The request is in progress, or completed but not dequeued */
+        if (ep->queue.next == &req->queue) {
+                _req->status = -ECONNRESET;
+                mv_u3d_ep_fifo_flush(_ep);
+
+                /* The request isn't the last request in this ep queue */
+                if (req->queue.next != &ep->queue) {
+                        dev_dbg(u3d->dev,
+                                "it is the last request in this ep queue\n");
+                        ep_context = ep->ep_context;
+                        next_req = list_entry(req->queue.next,
+                                        struct mv_u3d_req, queue);
+
+                        /* Point first TRB of next request to the EP context. */
+                        iowrite32((u32) next_req->trb_head,
+                                        &ep_context->trb_addr_lo);
+                } else {
+                        struct mv_u3d_ep_context *ep_context;
+                        ep_context = ep->ep_context;
+                        ep_context->trb_addr_lo = 0;
+                        ep_context->trb_addr_hi = 0;
+                }
+
+        } else
+                WARN_ON(1);
+
+        mv_u3d_done(ep, req, -ECONNRESET);
+
+        /* remove the req from the ep req list */
+        if (!list_empty(&ep->req_list)) {
+                struct mv_u3d_req *curr_req;
+                curr_req = list_entry(ep->req_list.next,
+                                        struct mv_u3d_req, list);
+                if (curr_req == req) {
+                        list_del_init(&req->list);
+                        ep->processing = 0;
+                }
+        }
+
+out:
+        spin_unlock_irqrestore(&ep->u3d->lock, flags);
+        return ret;
+}
+
+static void
+mv_u3d_ep_set_stall(struct mv_u3d *u3d, u8 ep_num, u8 direction, int stall)
+{
+        u32 tmp;
+        struct mv_u3d_ep *ep = u3d->eps;
+
+        dev_dbg(u3d->dev, "%s\n", __func__);
+        if (direction == MV_U3D_EP_DIR_OUT) {
+                tmp = ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxoutcr0);
+                if (stall)
+                        tmp |= MV_U3D_EPXCR_EP_HALT;
+                else
+                        tmp &= ~MV_U3D_EPXCR_EP_HALT;
+                iowrite32(tmp, &u3d->vuc_regs->epcr[ep->ep_num].epxoutcr0);
+        } else {
+                tmp = ioread32(&u3d->vuc_regs->epcr[ep->ep_num].epxincr0);
+                if (stall)
+                        tmp |= MV_U3D_EPXCR_EP_HALT;
+                else
+                        tmp &= ~MV_U3D_EPXCR_EP_HALT;
+                iowrite32(tmp, &u3d->vuc_regs->epcr[ep->ep_num].epxincr0);
+        }
+}
+
+static int mv_u3d_ep_set_halt_wedge(struct usb_ep *_ep, int halt, int wedge)
+{
+        struct mv_u3d_ep *ep;
+        unsigned long flags = 0;
+        int status = 0;
+        struct mv_u3d *u3d;
+
+        ep = container_of(_ep, struct mv_u3d_ep, ep);
+        u3d = ep->u3d;
+        if (!ep->ep.desc) {
+                status = -EINVAL;
+                goto out;
+        }
+
+        if (ep->ep.desc->bmAttributes == USB_ENDPOINT_XFER_ISOC) {
+                status = -EOPNOTSUPP;
+                goto out;
+        }
+
+        /*
+         * Attempt to halt IN ep will fail if any transfer requests
+         * are still queue
+         */
+        if (halt && (mv_u3d_ep_dir(ep) == MV_U3D_EP_DIR_IN)
+                        && !list_empty(&ep->queue)) {
+                status = -EAGAIN;
+                goto out;
+        }
+
+        spin_lock_irqsave(&ep->u3d->lock, flags);
+        mv_u3d_ep_set_stall(u3d, ep->ep_num, mv_u3d_ep_dir(ep), halt);
+        if (halt && wedge)
+                ep->wedge = 1;
+        else if (!halt)
+                ep->wedge = 0;
+        spin_unlock_irqrestore(&ep->u3d->lock, flags);
+
+        if (ep->ep_num == 0)
+                u3d->ep0_dir = MV_U3D_EP_DIR_OUT;
+out:
+        return status;
+}
+
+static int mv_u3d_ep_set_halt(struct usb_ep *_ep, int halt)
+{
+        return mv_u3d_ep_set_halt_wedge(_ep, halt, 0);
+}
+
+static int mv_u3d_ep_set_wedge(struct usb_ep *_ep)
+{
+        return mv_u3d_ep_set_halt_wedge(_ep, 1, 1);
+}
+
+static struct usb_ep_ops mv_u3d_ep_ops = {
+        .enable         = mv_u3d_ep_enable,
+        .disable        = mv_u3d_ep_disable,
+
+        .alloc_request  = mv_u3d_alloc_request,
+        .free_request   = mv_u3d_free_request,
+
+        .queue          = mv_u3d_ep_queue,
+        .dequeue        = mv_u3d_ep_dequeue,
+
+        .set_wedge      = mv_u3d_ep_set_wedge,
+        .set_halt       = mv_u3d_ep_set_halt,
+        .fifo_flush     = mv_u3d_ep_fifo_flush,
+};
+
+static void mv_u3d_controller_stop(struct mv_u3d *u3d)
+{
+        u32 tmp;
+
+        if (!u3d->clock_gating && u3d->vbus_valid_detect)
+                iowrite32(MV_U3D_INTR_ENABLE_VBUS_VALID,
+                                &u3d->vuc_regs->intrenable);
+        else
+                iowrite32(0, &u3d->vuc_regs->intrenable);
+        iowrite32(~0x0, &u3d->vuc_regs->endcomplete);
+        iowrite32(~0x0, &u3d->vuc_regs->trbunderrun);
+        iowrite32(~0x0, &u3d->vuc_regs->trbcomplete);
+        iowrite32(~0x0, &u3d->vuc_regs->linkchange);
+        iowrite32(0x1, &u3d->vuc_regs->setuplock);
+
+        /* Reset the RUN bit in the command register to stop USB */
+        tmp = ioread32(&u3d->op_regs->usbcmd);
+        tmp &= ~MV_U3D_CMD_RUN_STOP;
+        iowrite32(tmp, &u3d->op_regs->usbcmd);
+        dev_dbg(u3d->dev, "after u3d_stop, USBCMD 0x%x\n",
+                ioread32(&u3d->op_regs->usbcmd));
+}
+
+static void mv_u3d_controller_start(struct mv_u3d *u3d)
+{
+        u32 usbintr;
+        u32 temp;
+
+        /* enable link LTSSM state machine */
+        temp = ioread32(&u3d->vuc_regs->ltssm);
+        temp |= MV_U3D_LTSSM_PHY_INIT_DONE;
+        iowrite32(temp, &u3d->vuc_regs->ltssm);
+
+        /* Enable interrupts */
+        usbintr = MV_U3D_INTR_ENABLE_LINK_CHG | MV_U3D_INTR_ENABLE_TXDESC_ERR |
+                MV_U3D_INTR_ENABLE_RXDESC_ERR | MV_U3D_INTR_ENABLE_TX_COMPLETE |
+                MV_U3D_INTR_ENABLE_RX_COMPLETE | MV_U3D_INTR_ENABLE_SETUP |
+                (u3d->vbus_valid_detect ? MV_U3D_INTR_ENABLE_VBUS_VALID : 0);
+        iowrite32(usbintr, &u3d->vuc_regs->intrenable);
+
+        /* Enable ctrl ep */
+        iowrite32(0x1, &u3d->vuc_regs->ctrlepenable);
+
+        /* Set the Run bit in the command register */
+        iowrite32(MV_U3D_CMD_RUN_STOP, &u3d->op_regs->usbcmd);
+        dev_dbg(u3d->dev, "after u3d_start, USBCMD 0x%x\n",
+                ioread32(&u3d->op_regs->usbcmd));
+}
+
+static int mv_u3d_controller_reset(struct mv_u3d *u3d)
+{
+        unsigned int loops;
+        u32 tmp;
+
+        /* Stop the controller */
+        tmp = ioread32(&u3d->op_regs->usbcmd);
+        tmp &= ~MV_U3D_CMD_RUN_STOP;
+        iowrite32(tmp, &u3d->op_regs->usbcmd);
+
+        /* Reset the controller to get default values */
+        iowrite32(MV_U3D_CMD_CTRL_RESET, &u3d->op_regs->usbcmd);
+
+        /* wait for reset to complete */
+        loops = LOOPS(MV_U3D_RESET_TIMEOUT);
+        while (ioread32(&u3d->op_regs->usbcmd) & MV_U3D_CMD_CTRL_RESET) {
+                if (loops == 0) {
+                        dev_err(u3d->dev,
+                                "Wait for RESET completed TIMEOUT\n");
+                        return -ETIMEDOUT;
+                }
+                loops--;
+                udelay(LOOPS_USEC);
+        }
+
+        /* Configure the Endpoint Context Address */
+        iowrite32(u3d->ep_context_dma, &u3d->op_regs->dcbaapl);
+        iowrite32(0, &u3d->op_regs->dcbaaph);
+
+        return 0;
+}
+
+static int mv_u3d_enable(struct mv_u3d *u3d)
+{
+        struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+        int retval;
+
+        if (u3d->active)
+                return 0;
+
+        if (!u3d->clock_gating) {
+                u3d->active = 1;
+                return 0;
+        }
+
+        dev_dbg(u3d->dev, "enable u3d\n");
+        clk_enable(u3d->clk);
+        if (pdata->phy_init) {
+                retval = pdata->phy_init(u3d->phy_regs);
+                if (retval) {
+                        dev_err(u3d->dev,
+                                "init phy error %d\n", retval);
+                        clk_disable(u3d->clk);
+                        return retval;
+                }
+        }
+        u3d->active = 1;
+
+        return 0;
+}
+
+static void mv_u3d_disable(struct mv_u3d *u3d)
+{
+        struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+        if (u3d->clock_gating && u3d->active) {
+                dev_dbg(u3d->dev, "disable u3d\n");
+                if (pdata->phy_deinit)
+                        pdata->phy_deinit(u3d->phy_regs);
+                clk_disable(u3d->clk);
+                u3d->active = 0;
+        }
+}
+
+static int mv_u3d_vbus_session(struct usb_gadget *gadget, int is_active)
+{
+        struct mv_u3d *u3d;
+        unsigned long flags;
+        int retval = 0;
+
+        u3d = container_of(gadget, struct mv_u3d, gadget);
+
+        spin_lock_irqsave(&u3d->lock, flags);
+
+        u3d->vbus_active = (is_active != 0);
+        dev_dbg(u3d->dev, "%s: softconnect %d, vbus_active %d\n",
+                __func__, u3d->softconnect, u3d->vbus_active);
+        /*
+         * 1. external VBUS detect: we can disable/enable clock on demand.
+         * 2. UDC VBUS detect: we have to enable clock all the time.
+         * 3. No VBUS detect: we have to enable clock all the time.
+         */
+        if (u3d->driver && u3d->softconnect && u3d->vbus_active) {
+                retval = mv_u3d_enable(u3d);
+                if (retval == 0) {
+                        /*
+                         * after clock is disabled, we lost all the register
+                         *  context. We have to re-init registers
+                         */
+                        mv_u3d_controller_reset(u3d);
+                        mv_u3d_ep0_reset(u3d);
+                        mv_u3d_controller_start(u3d);
+                }
+        } else if (u3d->driver && u3d->softconnect) {
+                if (!u3d->active)
+                        goto out;
+
+                /* stop all the transfer in queue*/
+                mv_u3d_stop_activity(u3d, u3d->driver);
+                mv_u3d_controller_stop(u3d);
+                mv_u3d_disable(u3d);
+        }
+
+out:
+        spin_unlock_irqrestore(&u3d->lock, flags);
+        return retval;
+}
+
+/* constrain controller's VBUS power usage
+ * This call is used by gadget drivers during SET_CONFIGURATION calls,
+ * reporting how much power the device may consume.  For example, this
+ * could affect how quickly batteries are recharged.
+ *
+ * Returns zero on success, else negative errno.
+ */
+static int mv_u3d_vbus_draw(struct usb_gadget *gadget, unsigned mA)
+{
+        struct mv_u3d *u3d = container_of(gadget, struct mv_u3d, gadget);
+
+        u3d->power = mA;
+
+        return 0;
+}
+
+static int mv_u3d_pullup(struct usb_gadget *gadget, int is_on)
+{
+        struct mv_u3d *u3d = container_of(gadget, struct mv_u3d, gadget);
+        unsigned long flags;
+        int retval = 0;
+
+        spin_lock_irqsave(&u3d->lock, flags);
+
+        dev_dbg(u3d->dev, "%s: softconnect %d, vbus_active %d\n",
+                __func__, u3d->softconnect, u3d->vbus_active);
+        u3d->softconnect = (is_on != 0);
+        if (u3d->driver && u3d->softconnect && u3d->vbus_active) {
+                retval = mv_u3d_enable(u3d);
+                if (retval == 0) {
+                        /*
+                         * after clock is disabled, we lost all the register
+                         *  context. We have to re-init registers
+                         */
+                        mv_u3d_controller_reset(u3d);
+                        mv_u3d_ep0_reset(u3d);
+                        mv_u3d_controller_start(u3d);
+                }
+        } else if (u3d->driver && u3d->vbus_active) {
+                /* stop all the transfer in queue*/
+                mv_u3d_stop_activity(u3d, u3d->driver);
+                mv_u3d_controller_stop(u3d);
+                mv_u3d_disable(u3d);
+        }
+
+        spin_unlock_irqrestore(&u3d->lock, flags);
+
+        return retval;
+}
+
+static int mv_u3d_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
+{
+        struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
+        struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+        unsigned long flags;
+
+        if (u3d->driver)
+                return -EBUSY;
+
+        spin_lock_irqsave(&u3d->lock, flags);
+
+        if (!u3d->clock_gating) {
+                clk_enable(u3d->clk);
+                if (pdata->phy_init)
+                        pdata->phy_init(u3d->phy_regs);
+        }
+
+        /* hook up the driver ... */
+        driver->driver.bus = NULL;
+        u3d->driver = driver;
+        u3d->gadget.dev.driver = &driver->driver;
+
+        u3d->ep0_dir = USB_DIR_OUT;
+
+        spin_unlock_irqrestore(&u3d->lock, flags);
+
+        u3d->vbus_valid_detect = 1;
+
+        return 0;
+}
+
+static int mv_u3d_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
+{
+        struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
+        struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+        unsigned long flags;
+
+        u3d->vbus_valid_detect = 0;
+        spin_lock_irqsave(&u3d->lock, flags);
+
+        /* enable clock to access controller register */
+        clk_enable(u3d->clk);
+        if (pdata->phy_init)
+                pdata->phy_init(u3d->phy_regs);
+
+        mv_u3d_controller_stop(u3d);
+        /* stop all usb activities */
+        u3d->gadget.speed = USB_SPEED_UNKNOWN;
+        mv_u3d_stop_activity(u3d, driver);
+        mv_u3d_disable(u3d);
+
+        if (pdata->phy_deinit)
+                pdata->phy_deinit(u3d->phy_regs);
+        clk_disable(u3d->clk);
+
+        spin_unlock_irqrestore(&u3d->lock, flags);
+
+        u3d->gadget.dev.driver = NULL;
+        u3d->driver = NULL;
+
+        return 0;
+}
+
+/* device controller usb_gadget_ops structure */
+static const struct usb_gadget_ops mv_u3d_ops = {
+        /* notify controller that VBUS is powered or not */
+        .vbus_session   = mv_u3d_vbus_session,
+
+        /* constrain controller's VBUS power usage */
+        .vbus_draw      = mv_u3d_vbus_draw,
+
+        .pullup         = mv_u3d_pullup,
+        .udc_start      = mv_u3d_start,
+        .udc_stop       = mv_u3d_stop,
+};
+
+static int mv_u3d_eps_init(struct mv_u3d *u3d)
+{
+        struct mv_u3d_ep        *ep;
+        char name[14];
+        int i;
+
+        /* initialize ep0, ep0 in/out use eps[1] */
+        ep = &u3d->eps[1];
+        ep->u3d = u3d;
+        strncpy(ep->name, "ep0", sizeof(ep->name));
+        ep->ep.name = ep->name;
+        ep->ep.ops = &mv_u3d_ep_ops;
+        ep->wedge = 0;
+        ep->ep.maxpacket = MV_U3D_EP0_MAX_PKT_SIZE;
+        ep->ep_num = 0;
+        ep->ep.desc = &mv_u3d_ep0_desc;
+        INIT_LIST_HEAD(&ep->queue);
+        INIT_LIST_HEAD(&ep->req_list);
+        ep->ep_type = USB_ENDPOINT_XFER_CONTROL;
+
+        /* add ep0 ep_context */
+        ep->ep_context = &u3d->ep_context[1];
+
+        /* initialize other endpoints */
+        for (i = 2; i < u3d->max_eps * 2; i++) {
+                ep = &u3d->eps[i];
+                if (i & 1) {
+                        snprintf(name, sizeof(name), "ep%din", i >> 1);
+                        ep->direction = MV_U3D_EP_DIR_IN;
+                } else {
+                        snprintf(name, sizeof(name), "ep%dout", i >> 1);
+                        ep->direction = MV_U3D_EP_DIR_OUT;
+                }
+                ep->u3d = u3d;
+                strncpy(ep->name, name, sizeof(ep->name));
+                ep->ep.name = ep->name;
+
+                ep->ep.ops = &mv_u3d_ep_ops;
+                ep->ep.maxpacket = (unsigned short) ~0;
+                ep->ep_num = i / 2;
+
+                INIT_LIST_HEAD(&ep->queue);
+                list_add_tail(&ep->ep.ep_list, &u3d->gadget.ep_list);
+
+                INIT_LIST_HEAD(&ep->req_list);
+                spin_lock_init(&ep->req_lock);
+                ep->ep_context = &u3d->ep_context[i];
+        }
+
+        return 0;
+}
+
+/* delete all endpoint requests, called with spinlock held */
+static void mv_u3d_nuke(struct mv_u3d_ep *ep, int status)
+{
+        /* endpoint fifo flush */
+        mv_u3d_ep_fifo_flush(&ep->ep);
+
+        while (!list_empty(&ep->queue)) {
+                struct mv_u3d_req *req = NULL;
+                req = list_entry(ep->queue.next, struct mv_u3d_req, queue);
+                mv_u3d_done(ep, req, status);
+        }
+}
+
+/* stop all USB activities */
+static
+void mv_u3d_stop_activity(struct mv_u3d *u3d, struct usb_gadget_driver *driver)
+{
+        struct mv_u3d_ep        *ep;
+
+        mv_u3d_nuke(&u3d->eps[1], -ESHUTDOWN);
+
+        list_for_each_entry(ep, &u3d->gadget.ep_list, ep.ep_list) {
+                mv_u3d_nuke(ep, -ESHUTDOWN);
+        }
+
+        /* report disconnect; the driver is already quiesced */
+        if (driver) {
+                spin_unlock(&u3d->lock);
+                driver->disconnect(&u3d->gadget);
+                spin_lock(&u3d->lock);
+        }
+}
+
+static void mv_u3d_irq_process_error(struct mv_u3d *u3d)
+{
+        /* Increment the error count */
+        u3d->errors++;
+        dev_err(u3d->dev, "%s\n", __func__);
+}
+
+static void mv_u3d_irq_process_link_change(struct mv_u3d *u3d)
+{
+        u32 linkchange;
+
+        linkchange = ioread32(&u3d->vuc_regs->linkchange);
+        iowrite32(linkchange, &u3d->vuc_regs->linkchange);
+
+        dev_dbg(u3d->dev, "linkchange: 0x%x\n", linkchange);
+
+        if (linkchange & MV_U3D_LINK_CHANGE_LINK_UP) {
+                dev_dbg(u3d->dev, "link up: ltssm state: 0x%x\n",
+                        ioread32(&u3d->vuc_regs->ltssmstate));
+
+                u3d->usb_state = USB_STATE_DEFAULT;
+                u3d->ep0_dir = MV_U3D_EP_DIR_OUT;
+                u3d->ep0_state = MV_U3D_WAIT_FOR_SETUP;
+
+                /* set speed */
+                u3d->gadget.speed = USB_SPEED_SUPER;
+        }
+
+        if (linkchange & MV_U3D_LINK_CHANGE_SUSPEND) {
+                dev_dbg(u3d->dev, "link suspend\n");
+                u3d->resume_state = u3d->usb_state;
+                u3d->usb_state = USB_STATE_SUSPENDED;
+        }
+
+        if (linkchange & MV_U3D_LINK_CHANGE_RESUME) {
+                dev_dbg(u3d->dev, "link resume\n");
+                u3d->usb_state = u3d->resume_state;
+                u3d->resume_state = 0;
+        }
+
+        if (linkchange & MV_U3D_LINK_CHANGE_WRESET) {
+                dev_dbg(u3d->dev, "warm reset\n");
+                u3d->usb_state = USB_STATE_POWERED;
+        }
+
+        if (linkchange & MV_U3D_LINK_CHANGE_HRESET) {
+                dev_dbg(u3d->dev, "hot reset\n");
+                u3d->usb_state = USB_STATE_DEFAULT;
+        }
+
+        if (linkchange & MV_U3D_LINK_CHANGE_INACT)
+                dev_dbg(u3d->dev, "inactive\n");
+
+        if (linkchange & MV_U3D_LINK_CHANGE_DISABLE_AFTER_U0)
+                dev_dbg(u3d->dev, "ss.disabled\n");
+
+        if (linkchange & MV_U3D_LINK_CHANGE_VBUS_INVALID) {
+                dev_dbg(u3d->dev, "vbus invalid\n");
+                u3d->usb_state = USB_STATE_ATTACHED;
+                u3d->vbus_valid_detect = 1;
+                /* if external vbus detect is not supported,
+                 * we handle it here.
+                 */
+                if (!u3d->vbus) {
+                        spin_unlock(&u3d->lock);
+                        mv_u3d_vbus_session(&u3d->gadget, 0);
+                        spin_lock(&u3d->lock);
+                }
+        }
+}
+
+static void mv_u3d_ch9setaddress(struct mv_u3d *u3d,
+                                struct usb_ctrlrequest *setup)
+{
+        u32 tmp;
+
+        if (u3d->usb_state != USB_STATE_DEFAULT) {
+                dev_err(u3d->dev,
+                        "%s, cannot setaddr in this state (%d)\n",
+                        __func__, u3d->usb_state);
+                goto err;
+        }
+
+        u3d->dev_addr = (u8)setup->wValue;
+
+        dev_dbg(u3d->dev, "%s: 0x%x\n", __func__, u3d->dev_addr);
+
+        if (u3d->dev_addr > 127) {
+                dev_err(u3d->dev,
+                        "%s, u3d address is wrong (out of range)\n", __func__);
+                u3d->dev_addr = 0;
+                goto err;
+        }
+
+        /* update usb state */
+        u3d->usb_state = USB_STATE_ADDRESS;
+
+        /* set the new address */
+        tmp = ioread32(&u3d->vuc_regs->devaddrtiebrkr);
+        tmp &= ~0x7F;
+        tmp |= (u32)u3d->dev_addr;
+        iowrite32(tmp, &u3d->vuc_regs->devaddrtiebrkr);
+
+        return;
+err:
+        mv_u3d_ep0_stall(u3d);
+}
+
+static int mv_u3d_is_set_configuration(struct usb_ctrlrequest *setup)
+{
+        if ((setup->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD)
+                if (setup->bRequest == USB_REQ_SET_CONFIGURATION)
+                        return 1;
+
+        return 0;
+}
+
+static void mv_u3d_handle_setup_packet(struct mv_u3d *u3d, u8 ep_num,
+        struct usb_ctrlrequest *setup)
+{
+        bool delegate = false;
+
+        mv_u3d_nuke(&u3d->eps[ep_num * 2 + MV_U3D_EP_DIR_IN], -ESHUTDOWN);
+
+        dev_dbg(u3d->dev, "SETUP %02x.%02x v%04x i%04x l%04x\n",
+                        setup->bRequestType, setup->bRequest,
+                        setup->wValue, setup->wIndex, setup->wLength);
+
+        /* We process some stardard setup requests here */
+        if ((setup->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
+                switch (setup->bRequest) {
+                case USB_REQ_GET_STATUS:
+                        delegate = true;
+                        break;
+
+                case USB_REQ_SET_ADDRESS:
+                        mv_u3d_ch9setaddress(u3d, setup);
+                        break;
+
+                case USB_REQ_CLEAR_FEATURE:
+                        delegate = true;
+                        break;
+
+                case USB_REQ_SET_FEATURE:
+                        delegate = true;
+                        break;
+
+                default:
+                        delegate = true;
+                }
+        } else
+                delegate = true;
+
+        /* delegate USB standard requests to the gadget driver */
+        if (delegate == true) {
+                /* USB requests handled by gadget */
+                if (setup->wLength) {
+                        /* DATA phase from gadget, STATUS phase from u3d */
+                        u3d->ep0_dir = (setup->bRequestType & USB_DIR_IN)
+                                        ? MV_U3D_EP_DIR_IN : MV_U3D_EP_DIR_OUT;
+                        spin_unlock(&u3d->lock);
+                        if (u3d->driver->setup(&u3d->gadget,
+                                &u3d->local_setup_buff) < 0) {
+                                dev_err(u3d->dev, "setup error!\n");
+                                mv_u3d_ep0_stall(u3d);
+                        }
+                        spin_lock(&u3d->lock);
+                } else {
+                        /* no DATA phase, STATUS phase from gadget */
+                        u3d->ep0_dir = MV_U3D_EP_DIR_IN;
+                        u3d->ep0_state = MV_U3D_STATUS_STAGE;
+                        spin_unlock(&u3d->lock);
+                        if (u3d->driver->setup(&u3d->gadget,
+                                &u3d->local_setup_buff) < 0)
+                                mv_u3d_ep0_stall(u3d);
+                        spin_lock(&u3d->lock);
+                }
+
+                if (mv_u3d_is_set_configuration(setup)) {
+                        dev_dbg(u3d->dev, "u3d configured\n");
+                        u3d->usb_state = USB_STATE_CONFIGURED;
+                }
+        }
+}
+
+static void mv_u3d_get_setup_data(struct mv_u3d *u3d, u8 ep_num, u8 *buffer_ptr)
+{
+        struct mv_u3d_ep_context *epcontext;
+
+        epcontext = &u3d->ep_context[ep_num * 2 + MV_U3D_EP_DIR_IN];
+
+        /* Copy the setup packet to local buffer */
+        memcpy(buffer_ptr, (u8 *) &epcontext->setup_buffer, 8);
+}
+
+static void mv_u3d_irq_process_setup(struct mv_u3d *u3d)
+{
+        u32 tmp, i;
+        /* Process all Setup packet received interrupts */
+        tmp = ioread32(&u3d->vuc_regs->setuplock);
+        if (tmp) {
+                for (i = 0; i < u3d->max_eps; i++) {
+                        if (tmp & (1 << i)) {
+                                mv_u3d_get_setup_data(u3d, i,
+                                        (u8 *)(&u3d->local_setup_buff));
+                                mv_u3d_handle_setup_packet(u3d, i,
+                                        &u3d->local_setup_buff);
+                        }
+                }
+        }
+
+        iowrite32(tmp, &u3d->vuc_regs->setuplock);
+}
+
+static void mv_u3d_irq_process_tr_complete(struct mv_u3d *u3d)
+{
+        u32 tmp, bit_pos;
+        int i, ep_num = 0, direction = 0;
+        struct mv_u3d_ep        *curr_ep;
+        struct mv_u3d_req *curr_req, *temp_req;
+        int status;
+
+        tmp = ioread32(&u3d->vuc_regs->endcomplete);
+
+        dev_dbg(u3d->dev, "tr_complete: ep: 0x%x\n", tmp);
+        if (!tmp)
+                return;
+        iowrite32(tmp, &u3d->vuc_regs->endcomplete);
+
+        for (i = 0; i < u3d->max_eps * 2; i++) {
+                ep_num = i >> 1;
+                direction = i % 2;
+
+                bit_pos = 1 << (ep_num + 16 * direction);
+
+                if (!(bit_pos & tmp))
+                        continue;
+
+                if (i == 0)
+                        curr_ep = &u3d->eps[1];
+                else
+                        curr_ep = &u3d->eps[i];
+
+                /* remove req out of ep request list after completion */
+                dev_dbg(u3d->dev, "tr comp: check req_list\n");
+                spin_lock(&curr_ep->req_lock);
+                if (!list_empty(&curr_ep->req_list)) {
+                        struct mv_u3d_req *req;
+                        req = list_entry(curr_ep->req_list.next,
+                                                struct mv_u3d_req, list);
+                        list_del_init(&req->list);
+                        curr_ep->processing = 0;
+                }
+                spin_unlock(&curr_ep->req_lock);
+
+                /* process the req queue until an uncomplete request */
+                list_for_each_entry_safe(curr_req, temp_req,
+                        &curr_ep->queue, queue) {
+                        status = mv_u3d_process_ep_req(u3d, i, curr_req);
+                        if (status)
+                                break;
+                        /* write back status to req */
+                        curr_req->req.status = status;
+
+                        /* ep0 request completion */
+                        if (ep_num == 0) {
+                                mv_u3d_done(curr_ep, curr_req, 0);
+                                break;
+                        } else {
+                                mv_u3d_done(curr_ep, curr_req, status);
+                        }
+                }
+
+                dev_dbg(u3d->dev, "call mv_u3d_start_queue from ep complete\n");
+                mv_u3d_start_queue(curr_ep);
+        }
+}
+
+static irqreturn_t mv_u3d_irq(int irq, void *dev)
+{
+        struct mv_u3d *u3d = (struct mv_u3d *)dev;
+        u32 status, intr;
+        u32 bridgesetting;
+        u32 trbunderrun;
+
+        spin_lock(&u3d->lock);
+
+        status = ioread32(&u3d->vuc_regs->intrcause);
+        intr = ioread32(&u3d->vuc_regs->intrenable);
+        status &= intr;
+
+        if (status == 0) {
+                spin_unlock(&u3d->lock);
+                dev_err(u3d->dev, "irq error!\n");
+                return IRQ_NONE;
+        }
+
+        if (status & MV_U3D_USBINT_VBUS_VALID) {
+                bridgesetting = ioread32(&u3d->vuc_regs->bridgesetting);
+                if (bridgesetting & MV_U3D_BRIDGE_SETTING_VBUS_VALID) {
+                        /* write vbus valid bit of bridge setting to clear */
+                        bridgesetting = MV_U3D_BRIDGE_SETTING_VBUS_VALID;
+                        iowrite32(bridgesetting, &u3d->vuc_regs->bridgesetting);
+                        dev_dbg(u3d->dev, "vbus valid\n");
+
+                        u3d->usb_state = USB_STATE_POWERED;
+                        u3d->vbus_valid_detect = 0;
+                        /* if external vbus detect is not supported,
+                         * we handle it here.
+                         */
+                        if (!u3d->vbus) {
+                                spin_unlock(&u3d->lock);
+                                mv_u3d_vbus_session(&u3d->gadget, 1);
+                                spin_lock(&u3d->lock);
+                        }
+                } else
+                        dev_err(u3d->dev, "vbus bit is not set\n");
+        }
+
+        /* RX data is already in the 16KB FIFO.*/
+        if (status & MV_U3D_USBINT_UNDER_RUN) {
+                trbunderrun = ioread32(&u3d->vuc_regs->trbunderrun);
+                dev_err(u3d->dev, "under run, ep%d\n", trbunderrun);
+                iowrite32(trbunderrun, &u3d->vuc_regs->trbunderrun);
+                mv_u3d_irq_process_error(u3d);
+        }
+
+        if (status & (MV_U3D_USBINT_RXDESC_ERR | MV_U3D_USBINT_TXDESC_ERR)) {
+                /* write one to clear */
+                iowrite32(status & (MV_U3D_USBINT_RXDESC_ERR
+                        | MV_U3D_USBINT_TXDESC_ERR),
+                        &u3d->vuc_regs->intrcause);
+                dev_err(u3d->dev, "desc err 0x%x\n", status);
+                mv_u3d_irq_process_error(u3d);
+        }
+
+        if (status & MV_U3D_USBINT_LINK_CHG)
+                mv_u3d_irq_process_link_change(u3d);
+
+        if (status & MV_U3D_USBINT_TX_COMPLETE)
+                mv_u3d_irq_process_tr_complete(u3d);
+
+        if (status & MV_U3D_USBINT_RX_COMPLETE)
+                mv_u3d_irq_process_tr_complete(u3d);
+
+        if (status & MV_U3D_USBINT_SETUP)
+                mv_u3d_irq_process_setup(u3d);
+
+        spin_unlock(&u3d->lock);
+        return IRQ_HANDLED;
+}
+
+static void mv_u3d_gadget_release(struct device *dev)
+{
+        dev_dbg(dev, "%s\n", __func__);
+}
+
+static __devexit int mv_u3d_remove(struct platform_device *dev)
+{
+        struct mv_u3d *u3d = platform_get_drvdata(dev);
+
+        BUG_ON(u3d == NULL);
+
+        usb_del_gadget_udc(&u3d->gadget);
+
+        /* free memory allocated in probe */
+        if (u3d->trb_pool)
+                dma_pool_destroy(u3d->trb_pool);
+
+        if (u3d->ep_context)
+                dma_free_coherent(&dev->dev, u3d->ep_context_size,
+                        u3d->ep_context, u3d->ep_context_dma);
+
+        kfree(u3d->eps);
+
+        if (u3d->irq)
+                free_irq(u3d->irq, &dev->dev);
+
+        if (u3d->cap_regs)
+                iounmap(u3d->cap_regs);
+        u3d->cap_regs = NULL;
+
+        kfree(u3d->status_req);
+
+        clk_put(u3d->clk);
+
+        device_unregister(&u3d->gadget.dev);
+
+        platform_set_drvdata(dev, NULL);
+
+        kfree(u3d);
+
+        return 0;
+}
+
+static int mv_u3d_probe(struct platform_device *dev)
+{
+        struct mv_u3d *u3d = NULL;
+        struct mv_usb_platform_data *pdata = dev->dev.platform_data;
+        int retval = 0;
+        struct resource *r;
+        size_t size;
+
+        if (!dev->dev.platform_data) {
+                dev_err(&dev->dev, "missing platform_data\n");
+                retval = -ENODEV;
+                goto err_pdata;
+        }
+
+        u3d = kzalloc(sizeof(*u3d), GFP_KERNEL);
+        if (!u3d) {
+                dev_err(&dev->dev, "failed to allocate memory for u3d\n");
+                retval = -ENOMEM;
+                goto err_alloc_private;
+        }
+
+        spin_lock_init(&u3d->lock);
+
+        platform_set_drvdata(dev, u3d);
+
+        u3d->dev = &dev->dev;
+        u3d->vbus = pdata->vbus;
+
+        u3d->clk = clk_get(&dev->dev, pdata->clkname[0]);
+        if (IS_ERR(u3d->clk)) {
+                retval = PTR_ERR(u3d->clk);
+                goto err_get_clk;
+        }
+
+        r = platform_get_resource_byname(dev, IORESOURCE_MEM, "capregs");
+        if (!r) {
+                dev_err(&dev->dev, "no I/O memory resource defined\n");
+                retval = -ENODEV;
+                goto err_get_cap_regs;
+        }
+
+        u3d->cap_regs = (struct mv_u3d_cap_regs __iomem *)
+                ioremap(r->start, resource_size(r));
+        if (!u3d->cap_regs) {
+                dev_err(&dev->dev, "failed to map I/O memory\n");
+                retval = -EBUSY;
+                goto err_map_cap_regs;
+        } else {
+                dev_dbg(&dev->dev, "cap_regs address: 0x%x/0x%x\n",
+                        (unsigned int)r->start, (unsigned int)u3d->cap_regs);
+        }
+
+        /* we will access controller register, so enable the u3d controller */
+        clk_enable(u3d->clk);
+
+        if (pdata->phy_init) {
+                retval = pdata->phy_init(u3d->phy_regs);
+                if (retval) {
+                        dev_err(&dev->dev, "init phy error %d\n", retval);
+                        goto err_u3d_enable;
+                }
+        }
+
+        u3d->op_regs = (struct mv_u3d_op_regs __iomem *)((u32)u3d->cap_regs
+                + MV_U3D_USB3_OP_REGS_OFFSET);
+
+        u3d->vuc_regs = (struct mv_u3d_vuc_regs __iomem *)((u32)u3d->cap_regs
+                + ioread32(&u3d->cap_regs->vuoff));
+
+        u3d->max_eps = 16;
+
+        /*
+         * some platform will use usb to download image, it may not disconnect
+         * usb gadget before loading kernel. So first stop u3d here.
+         */
+        mv_u3d_controller_stop(u3d);
+        iowrite32(0xFFFFFFFF, &u3d->vuc_regs->intrcause);
+
+        if (pdata->phy_deinit)
+                pdata->phy_deinit(u3d->phy_regs);
+        clk_disable(u3d->clk);
+
+        size = u3d->max_eps * sizeof(struct mv_u3d_ep_context) * 2;
+        size = (size + MV_U3D_EP_CONTEXT_ALIGNMENT - 1)
+                & ~(MV_U3D_EP_CONTEXT_ALIGNMENT - 1);
+        u3d->ep_context = dma_alloc_coherent(&dev->dev, size,
+                                        &u3d->ep_context_dma, GFP_KERNEL);
+        if (!u3d->ep_context) {
+                dev_err(&dev->dev, "allocate ep context memory failed\n");
+                retval = -ENOMEM;
+                goto err_alloc_ep_context;
+        }
+        u3d->ep_context_size = size;
+
+        /* create TRB dma_pool resource */
+        u3d->trb_pool = dma_pool_create("u3d_trb",
+                        &dev->dev,
+                        sizeof(struct mv_u3d_trb_hw),
+                        MV_U3D_TRB_ALIGNMENT,
+                        MV_U3D_DMA_BOUNDARY);
+
+        if (!u3d->trb_pool) {
+                retval = -ENOMEM;
+                goto err_alloc_trb_pool;
+        }
+
+        size = u3d->max_eps * sizeof(struct mv_u3d_ep) * 2;
+        u3d->eps = kzalloc(size, GFP_KERNEL);
+        if (!u3d->eps) {
+                dev_err(&dev->dev, "allocate ep memory failed\n");
+                retval = -ENOMEM;
+                goto err_alloc_eps;
+        }
+
+        /* initialize ep0 status request structure */
+        u3d->status_req = kzalloc(sizeof(struct mv_u3d_req) + 8, GFP_KERNEL);
+        if (!u3d->status_req) {
+                dev_err(&dev->dev, "allocate status_req memory failed\n");
+                retval = -ENOMEM;
+                goto err_alloc_status_req;
+        }
+        INIT_LIST_HEAD(&u3d->status_req->queue);
+
+        /* allocate a small amount of memory to get valid address */
+        u3d->status_req->req.buf = (char *)u3d->status_req
+                                        + sizeof(struct mv_u3d_req);
+        u3d->status_req->req.dma = virt_to_phys(u3d->status_req->req.buf);
+
+        u3d->resume_state = USB_STATE_NOTATTACHED;
+        u3d->usb_state = USB_STATE_ATTACHED;
+        u3d->ep0_dir = MV_U3D_EP_DIR_OUT;
+        u3d->remote_wakeup = 0;
+
+        r = platform_get_resource(dev, IORESOURCE_IRQ, 0);
+        if (!r) {
+                dev_err(&dev->dev, "no IRQ resource defined\n");
+                retval = -ENODEV;
+                goto err_get_irq;
+        }
+        u3d->irq = r->start;
+        if (request_irq(u3d->irq, mv_u3d_irq,
+                IRQF_DISABLED | IRQF_SHARED, driver_name, u3d)) {
+                u3d->irq = 0;
+                dev_err(&dev->dev, "Request irq %d for u3d failed\n",
+                        u3d->irq);
+                retval = -ENODEV;
+                goto err_request_irq;
+        }
+
+        /* initialize gadget structure */
+        u3d->gadget.ops = &mv_u3d_ops;  /* usb_gadget_ops */
+        u3d->gadget.ep0 = &u3d->eps[1].ep;      /* gadget ep0 */
+        INIT_LIST_HEAD(&u3d->gadget.ep_list);   /* ep_list */
+        u3d->gadget.speed = USB_SPEED_UNKNOWN;  /* speed */
+
+        /* the "gadget" abstracts/virtualizes the controller */
+        dev_set_name(&u3d->gadget.dev, "gadget");
+        u3d->gadget.dev.parent = &dev->dev;
+        u3d->gadget.dev.dma_mask = dev->dev.dma_mask;
+        u3d->gadget.dev.release = mv_u3d_gadget_release;
+        u3d->gadget.name = driver_name;         /* gadget name */
+
+        retval = device_register(&u3d->gadget.dev);
+        if (retval)
+                goto err_register_gadget_device;
+
+        mv_u3d_eps_init(u3d);
+
+        /* external vbus detection */
+        if (u3d->vbus) {
+                u3d->clock_gating = 1;
+                dev_err(&dev->dev, "external vbus detection\n");
+        }
+
+        if (!u3d->clock_gating)
+                u3d->vbus_active = 1;
+
+        /* enable usb3 controller vbus detection */
+        u3d->vbus_valid_detect = 1;
+
+        retval = usb_add_gadget_udc(&dev->dev, &u3d->gadget);
+        if (retval)
+                goto err_unregister;
+
+        dev_dbg(&dev->dev, "successful probe usb3 device %s clock gating.\n",
+                u3d->clock_gating ? "with" : "without");
+
+        return 0;
+
+err_unregister:
+        device_unregister(&u3d->gadget.dev);
+err_register_gadget_device:
+        free_irq(u3d->irq, &dev->dev);
+err_request_irq:
+err_get_irq:
+        kfree(u3d->status_req);
+err_alloc_status_req:
+        kfree(u3d->eps);
+err_alloc_eps:
+        dma_pool_destroy(u3d->trb_pool);
+err_alloc_trb_pool:
+        dma_free_coherent(&dev->dev, u3d->ep_context_size,
+                u3d->ep_context, u3d->ep_context_dma);
+err_alloc_ep_context:
+        if (pdata->phy_deinit)
+                pdata->phy_deinit(u3d->phy_regs);
+        clk_disable(u3d->clk);
+err_u3d_enable:
+        iounmap(u3d->cap_regs);
+err_map_cap_regs:
+err_get_cap_regs:
+err_get_clk:
+        clk_put(u3d->clk);
+        platform_set_drvdata(dev, NULL);
+        kfree(u3d);
+err_alloc_private:
+err_pdata:
+        return retval;
+}
+
+#ifdef CONFIG_PM
+static int mv_u3d_suspend(struct device *dev)
+{
+        struct mv_u3d *u3d = dev_get_drvdata(dev);
+
+        /*
+         * only cable is unplugged, usb can suspend.
+         * So do not care about clock_gating == 1, it is handled by
+         * vbus session.
+         */
+        if (!u3d->clock_gating) {
+                mv_u3d_controller_stop(u3d);
+
+                spin_lock_irq(&u3d->lock);
+                /* stop all usb activities */
+                mv_u3d_stop_activity(u3d, u3d->driver);
+                spin_unlock_irq(&u3d->lock);
+
+                mv_u3d_disable(u3d);
+        }
+
+        return 0;
+}
+
+static int mv_u3d_resume(struct device *dev)
+{
+        struct mv_u3d *u3d = dev_get_drvdata(dev);
+        int retval;
+
+        if (!u3d->clock_gating) {
+                retval = mv_u3d_enable(u3d);
+                if (retval)
+                        return retval;
+
+                if (u3d->driver && u3d->softconnect) {
+                        mv_u3d_controller_reset(u3d);
+                        mv_u3d_ep0_reset(u3d);
+                        mv_u3d_controller_start(u3d);
+                }
+        }
+
+        return 0;
+}
+
+SIMPLE_DEV_PM_OPS(mv_u3d_pm_ops, mv_u3d_suspend, mv_u3d_resume);
+#endif
+
+static void mv_u3d_shutdown(struct platform_device *dev)
+{
+        struct mv_u3d *u3d = dev_get_drvdata(&dev->dev);
+        u32 tmp;
+
+        tmp = ioread32(&u3d->op_regs->usbcmd);
+        tmp &= ~MV_U3D_CMD_RUN_STOP;
+        iowrite32(tmp, &u3d->op_regs->usbcmd);
+}
+
+static struct platform_driver mv_u3d_driver = {
+        .probe          = mv_u3d_probe,
+        .remove         = __exit_p(mv_u3d_remove),
+        .shutdown       = mv_u3d_shutdown,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "mv-u3d",
+#ifdef CONFIG_PM
+                .pm     = &mv_u3d_pm_ops,
+#endif
+        },
+};
+
+module_platform_driver(mv_u3d_driver);
+MODULE_ALIAS("platform:mv-u3d");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_AUTHOR("Yu Xu <yuxu@marvell.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index a460e8c204f4..b26c7d68cc06 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -36,9 +36,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
 #include <linux/prefetch.h>
+#include <linux/io.h>
 
 #include <asm/byteorder.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/unaligned.h>
 #include <asm/mach-types.h>
@@ -59,11 +59,6 @@
 #define DRIVER_DESC     "OMAP UDC driver"
 #define DRIVER_VERSION  "4 October 2004"
 
-#define DMA_ADDR_INVALID        (~(dma_addr_t)0)
-
-#define OMAP2_DMA_CH(ch)        (((ch) - 1) << 1)
-#define OMAP24XX_DMA(name, ch)  (OMAP24XX_DMA_##name + OMAP2_DMA_CH(ch))
-
 /*
  * The OMAP UDC needs _very_ early endpoint setup:  before enabling the
  * D+ pullup to allow enumeration.  That's too early for the gadget
@@ -87,14 +82,14 @@
 #ifdef  USE_ISO
 static unsigned fifo_mode = 3;
 #else
-static unsigned fifo_mode = 0;
+static unsigned fifo_mode;
 #endif
 
 /* "modprobe omap_udc fifo_mode=42", or else as a kernel
  * boot parameter "omap_udc:fifo_mode=42"
  */
-module_param (fifo_mode, uint, 0);
-MODULE_PARM_DESC (fifo_mode, "endpoint configuration");
+module_param(fifo_mode, uint, 0);
+MODULE_PARM_DESC(fifo_mode, "endpoint configuration");
 
 #ifdef  USE_DMA
 static bool use_dma = 1;
@@ -102,8 +97,8 @@ static bool use_dma = 1;
 /* "modprobe omap_udc use_dma=y", or else as a kernel
  * boot parameter "omap_udc:use_dma=y"
  */
-module_param (use_dma, bool, 0);
-MODULE_PARM_DESC (use_dma, "enable/disable DMA");
+module_param(use_dma, bool, 0);
+MODULE_PARM_DESC(use_dma, "enable/disable DMA");
 #else   /* !USE_DMA */
 
 /* save a bit of code */
@@ -111,8 +106,8 @@ MODULE_PARM_DESC (use_dma, "enable/disable DMA");
 #endif  /* !USE_DMA */
 
 
-static const char driver_name [] = "omap_udc";
-static const char driver_desc [] = DRIVER_DESC;
+static const char driver_name[] = "omap_udc";
+static const char driver_desc[] = DRIVER_DESC;
 
 /*-------------------------------------------------------------------------*/
 
@@ -250,7 +245,7 @@ static int omap_ep_disable(struct usb_ep *_ep)
 
         spin_lock_irqsave(&ep->udc->lock, flags);
         ep->ep.desc = NULL;
-        nuke (ep, -ESHUTDOWN);
+        nuke(ep, -ESHUTDOWN);
         ep->ep.maxpacket = ep->maxpacket;
         ep->has_dma = 0;
         omap_writew(UDC_SET_HALT, UDC_CTRL);
@@ -271,10 +266,11 @@ omap_alloc_request(struct usb_ep *ep, gfp_t gfp_flags)
         struct omap_req *req;
 
         req = kzalloc(sizeof(*req), gfp_flags);
-        if (req) {
-                req->req.dma = DMA_ADDR_INVALID;
-                INIT_LIST_HEAD (&req->queue);
-        }
+        if (!req)
+                return NULL;
+
+        INIT_LIST_HEAD(&req->queue);
+
         return &req->req;
 }
 
@@ -283,8 +279,7 @@ omap_free_request(struct usb_ep *ep, struct usb_request *_req)
 {
         struct omap_req *req = container_of(_req, struct omap_req, req);
 
-        if (_req)
-                kfree (req);
+        kfree(req);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -292,6 +287,7 @@ omap_free_request(struct usb_ep *ep, struct usb_request *_req)
 static void
 done(struct omap_ep *ep, struct omap_req *req, int status)
 {
+        struct omap_udc         *udc = ep->udc;
         unsigned                stopped = ep->stopped;
 
         list_del_init(&req->queue);
@@ -301,22 +297,9 @@ done(struct omap_ep *ep, struct omap_req *req, int status)
         else
                 status = req->req.status;
 
-        if (use_dma && ep->has_dma) {
-                if (req->mapped) {
-                        dma_unmap_single(ep->udc->gadget.dev.parent,
-                                req->req.dma, req->req.length,
-                                (ep->bEndpointAddress & USB_DIR_IN)
-                                        ? DMA_TO_DEVICE
-                                        : DMA_FROM_DEVICE);
-                        req->req.dma = DMA_ADDR_INVALID;
-                        req->mapped = 0;
-                } else
-                        dma_sync_single_for_cpu(ep->udc->gadget.dev.parent,
-                                req->req.dma, req->req.length,
-                                (ep->bEndpointAddress & USB_DIR_IN)
-                                        ? DMA_TO_DEVICE
-                                        : DMA_FROM_DEVICE);
-        }
+        if (use_dma && ep->has_dma)
+                usb_gadget_unmap_request(&udc->gadget, &req->req,
+                                (ep->bEndpointAddress & USB_DIR_IN));
 
 #ifndef USB_TRACE
         if (status && status != -ESHUTDOWN)
@@ -364,10 +347,10 @@ write_packet(u8 *buf, struct omap_req *req, unsigned max)
         return len;
 }
 
-// FIXME change r/w fifo calling convention
+/* FIXME change r/w fifo calling convention */
 
 
-// return:  0 = still running, 1 = completed, negative = errno
+/* return:  0 = still running, 1 = completed, negative = errno */
 static int write_fifo(struct omap_ep *ep, struct omap_req *req)
 {
         u8              *buf;
@@ -429,7 +412,7 @@ read_packet(u8 *buf, struct omap_req *req, unsigned avail)
         return len;
 }
 
-// return:  0 = still running, 1 = queue empty, negative = errno
+/* return:  0 = still running, 1 = queue empty, negative = errno */
 static int read_fifo(struct omap_ep *ep, struct omap_req *req)
 {
         u8              *buf;
@@ -536,12 +519,8 @@ static void next_in_dma(struct omap_ep *ep, struct omap_req *req)
                                 : OMAP_DMA_SYNC_ELEMENT;
         int             dma_trigger = 0;
 
-        if (cpu_is_omap24xx())
-                dma_trigger = OMAP24XX_DMA(USB_W2FC_TX0, ep->dma_channel);
-
         /* measure length in either bytes or packets */
         if ((cpu_is_omap16xx() && length <= UDC_TXN_TSC)
-                        || (cpu_is_omap24xx() && length < ep->maxpacket)
                         || (cpu_is_omap15xx() && length < ep->maxpacket)) {
                 txdma_ctrl = UDC_TXN_EOT | length;
                 omap_set_dma_transfer_params(ep->lch, OMAP_DMA_DATA_TYPE_S8,
@@ -600,28 +579,14 @@ static void next_out_dma(struct omap_ep *ep, struct omap_req *req)
         int dma_trigger = 0;
         u16 w;
 
-        if (cpu_is_omap24xx())
-                dma_trigger = OMAP24XX_DMA(USB_W2FC_RX0, ep->dma_channel);
-
-        /* NOTE:  we filtered out "short reads" before, so we know
-         * the buffer has only whole numbers of packets.
-         * except MODE SELECT(6) sent the 24 bytes data in OMAP24XX DMA mode
-         */
-        if (cpu_is_omap24xx() && packets < ep->maxpacket) {
-                omap_set_dma_transfer_params(ep->lch, OMAP_DMA_DATA_TYPE_S8,
-                                packets, 1, OMAP_DMA_SYNC_ELEMENT,
-                                dma_trigger, 0);
-                req->dma_bytes = packets;
-        } else {
-                /* set up this DMA transfer, enable the fifo, start */
-                packets /= ep->ep.maxpacket;
-                packets = min(packets, (unsigned)UDC_RXN_TC + 1);
-                req->dma_bytes = packets * ep->ep.maxpacket;
-                omap_set_dma_transfer_params(ep->lch, OMAP_DMA_DATA_TYPE_S16,
-                                ep->ep.maxpacket >> 1, packets,
-                                OMAP_DMA_SYNC_ELEMENT,
-                                dma_trigger, 0);
-        }
+        /* set up this DMA transfer, enable the fifo, start */
+        packets /= ep->ep.maxpacket;
+        packets = min(packets, (unsigned)UDC_RXN_TC + 1);
+        req->dma_bytes = packets * ep->ep.maxpacket;
+        omap_set_dma_transfer_params(ep->lch, OMAP_DMA_DATA_TYPE_S16,
+                        ep->ep.maxpacket >> 1, packets,
+                        OMAP_DMA_SYNC_ELEMENT,
+                        dma_trigger, 0);
         omap_set_dma_dest_params(ep->lch, OMAP_DMA_PORT_EMIFF,
                 OMAP_DMA_AMODE_POST_INC, req->req.dma + req->req.actual,
                 0, 0);
@@ -683,7 +648,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
                 }
                 omap_writew(UDC_TXN_DONE, UDC_IRQ_SRC);
 
-                if (!list_empty (&ep->queue)) {
+                if (!list_empty(&ep->queue)) {
                         req = container_of(ep->queue.next,
                                         struct omap_req, queue);
                         next_in_dma(ep, req);
@@ -702,7 +667,7 @@ static void dma_irq(struct omap_udc *udc, u16 irq_src)
                 }
                 omap_writew(UDC_RXN_EOT, UDC_IRQ_SRC);
 
-                if (!list_empty (&ep->queue)) {
+                if (!list_empty(&ep->queue)) {
                         req = container_of(ep->queue.next,
                                         struct omap_req, queue);
                         next_out_dma(ep, req);
@@ -760,10 +725,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
         ep->dma_channel = channel;
 
         if (is_in) {
-                if (cpu_is_omap24xx())
-                        dma_channel = OMAP24XX_DMA(USB_W2FC_TX0, channel);
-                else
-                        dma_channel = OMAP_DMA_USB_W2FC_TX0 - 1 + channel;
+                dma_channel = OMAP_DMA_USB_W2FC_TX0 - 1 + channel;
                 status = omap_request_dma(dma_channel,
                         ep->ep.name, dma_error, ep, &ep->lch);
                 if (status == 0) {
@@ -780,11 +742,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
                                 0, 0);
                 }
         } else {
-                if (cpu_is_omap24xx())
-                        dma_channel = OMAP24XX_DMA(USB_W2FC_RX0, channel);
-                else
-                        dma_channel = OMAP_DMA_USB_W2FC_RX0 - 1 + channel;
-
+                dma_channel = OMAP_DMA_USB_W2FC_RX0 - 1 + channel;
                 status = omap_request_dma(dma_channel,
                         ep->ep.name, dma_error, ep, &ep->lch);
                 if (status == 0) {
@@ -808,7 +766,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
                 omap_disable_dma_irq(ep->lch, OMAP_DMA_BLOCK_IRQ);
 
                 /* channel type P: hw synch (fifo) */
-                if (cpu_class_is_omap1() && !cpu_is_omap15xx())
+                if (!cpu_is_omap15xx())
                         omap_set_dma_channel_mode(ep->lch, OMAP_DMA_LCH_P);
         }
 
@@ -928,13 +886,11 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 
         /* this isn't bogus, but OMAP DMA isn't the only hardware to
          * have a hard time with partial packet reads...  reject it.
-         * Except OMAP2 can handle the small packets.
          */
         if (use_dma
                         && ep->has_dma
                         && ep->bEndpointAddress != 0
                         && (ep->bEndpointAddress & USB_DIR_IN) == 0
-                        && !cpu_class_is_omap2()
                         && (req->req.length % ep->ep.maxpacket) != 0) {
                 DBG("%s, no partial packet OUT reads\n", __func__);
                 return -EMSGSIZE;
@@ -944,26 +900,9 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
         if (!udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN)
                 return -ESHUTDOWN;
 
-        if (use_dma && ep->has_dma) {
-                if (req->req.dma == DMA_ADDR_INVALID) {
-                        req->req.dma = dma_map_single(
-                                ep->udc->gadget.dev.parent,
-                                req->req.buf,
-                                req->req.length,
-                                (ep->bEndpointAddress & USB_DIR_IN)
-                                        ? DMA_TO_DEVICE
-                                        : DMA_FROM_DEVICE);
-                        req->mapped = 1;
-                } else {
-                        dma_sync_single_for_device(
-                                ep->udc->gadget.dev.parent,
-                                req->req.dma, req->req.length,
-                                (ep->bEndpointAddress & USB_DIR_IN)
-                                        ? DMA_TO_DEVICE
-                                        : DMA_FROM_DEVICE);
-                        req->mapped = 0;
-                }
-        }
+        if (use_dma && ep->has_dma)
+                usb_gadget_map_request(&udc->gadget, &req->req,
+                                (ep->bEndpointAddress & USB_DIR_IN));
 
         VDBG("%s queue req %p, len %d buf %p\n",
                 ep->ep.name, _req, _req->length, _req->buf);
@@ -984,7 +923,7 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
                 int     is_in;
 
                 if (ep->bEndpointAddress == 0) {
-                        if (!udc->ep0_pending || !list_empty (&ep->queue)) {
+                        if (!udc->ep0_pending || !list_empty(&ep->queue)) {
                                 spin_unlock_irqrestore(&udc->lock, flags);
                                 return -EL2HLT;
                         }
@@ -1011,7 +950,8 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
                                  * always an IN ... even for IN transfers,
                                  * a weird case which seem to stall OMAP.
                                  */
-                                omap_writew(UDC_EP_SEL | UDC_EP_DIR, UDC_EP_NUM);
+                                omap_writew(UDC_EP_SEL | UDC_EP_DIR,
+                                                UDC_EP_NUM);
                                 omap_writew(UDC_CLR_EP, UDC_CTRL);
                                 omap_writew(UDC_SET_FIFO_EN, UDC_CTRL);
                                 omap_writew(UDC_EP_DIR, UDC_EP_NUM);
@@ -1023,7 +963,8 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
 
                         /* non-empty DATA stage */
                         } else if (is_in) {
-                                omap_writew(UDC_EP_SEL | UDC_EP_DIR, UDC_EP_NUM);
+                                omap_writew(UDC_EP_SEL | UDC_EP_DIR,
+                                                UDC_EP_NUM);
                         } else {
                                 if (udc->ep0_setup)
                                         goto irq_wait;
@@ -1071,7 +1012,7 @@ static int omap_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
         spin_lock_irqsave(&ep->udc->lock, flags);
 
         /* make sure it's actually queued on this endpoint */
-        list_for_each_entry (req, &ep->queue, queue) {
+        list_for_each_entry(req, &ep->queue, queue) {
                 if (&req->req == _req)
                         break;
         }
@@ -1178,8 +1119,8 @@ static struct usb_ep_ops omap_ep_ops = {
         .dequeue        = omap_ep_dequeue,
 
         .set_halt       = omap_ep_set_halt,
-        // fifo_status ... report bytes in fifo
-        // fifo_flush ... flush fifo
+        /* fifo_status ... report bytes in fifo */
+        /* fifo_flush ... flush fifo */
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1409,7 +1350,7 @@ static void udc_quiesce(struct omap_udc *udc)
 
         udc->gadget.speed = USB_SPEED_UNKNOWN;
         nuke(&udc->ep[0], -ESHUTDOWN);
-        list_for_each_entry (ep, &udc->gadget.ep_list, ep.ep_list)
+        list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list)
                 nuke(ep, -ESHUTDOWN);
 }
 
@@ -1525,7 +1466,8 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
                                 /* read next OUT packet of request, maybe
                                  * reactiviting the fifo; stall on errors.
                                  */
-                                if (!req || (stat = read_fifo(ep0, req)) < 0) {
+                                stat = read_fifo(ep0, req);
+                                if (!req || stat < 0) {
                                         omap_writew(UDC_STALL_CMD, UDC_SYSCON2);
                                         udc->ep0_pending = 0;
                                         stat = 0;
@@ -1658,7 +1600,7 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
                                 /* this has rude side-effects (aborts) and
                                  * can't really work if DMA-IN is active
                                  */
-                                DBG("%s host set_halt, NYET \n", ep->name);
+                                DBG("%s host set_halt, NYET\n", ep->name);
                                 goto do_stall;
                         }
                         use_ep(ep, 0);
@@ -1749,7 +1691,7 @@ delegate:
                          */
                         udc->ep0_setup = 1;
                         spin_unlock(&udc->lock);
-                        status = udc->driver->setup (&udc->gadget, &u.r);
+                        status = udc->driver->setup(&udc->gadget, &u.r);
                         spin_lock(&udc->lock);
                         udc->ep0_setup = 0;
                 }
@@ -1794,7 +1736,7 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
                                 VDBG("connect\n");
                                 if (!udc->transceiver)
                                         pullup_enable(udc);
-                                // if (driver->connect) call it
+                                /* if (driver->connect) call it */
                         } else if (udc->gadget.speed != USB_SPEED_UNKNOWN) {
                                 udc->gadget.speed = USB_SPEED_UNKNOWN;
                                 if (!udc->transceiver)
@@ -1826,7 +1768,7 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
         }
         if (change & UDC_SUS) {
                 if (udc->gadget.speed != USB_SPEED_UNKNOWN) {
-                        // FIXME tell isp1301 to suspend/resume (?)
+                        /* FIXME tell isp1301 to suspend/resume (?) */
                         if (devstat & UDC_SUS) {
                                 VDBG("suspend\n");
                                 update_otg(udc);
@@ -2029,7 +1971,7 @@ static irqreturn_t omap_udc_iso_irq(int irq, void *_dev)
         spin_lock_irqsave(&udc->lock, flags);
 
         /* handle all non-DMA ISO transfers */
-        list_for_each_entry (ep, &udc->iso, iso) {
+        list_for_each_entry(ep, &udc->iso, iso) {
                 u16             stat;
                 struct omap_req *req;
 
@@ -2088,15 +2030,11 @@ static irqreturn_t omap_udc_iso_irq(int irq, void *_dev)
 
 static inline int machine_without_vbus_sense(void)
 {
-        return (machine_is_omap_innovator()
+        return machine_is_omap_innovator()
                 || machine_is_omap_osk()
-                || machine_is_omap_apollon()
-#ifndef CONFIG_MACH_OMAP_H4_OTG
-                || machine_is_omap_h4()
-#endif
                 || machine_is_sx1()
-                || cpu_is_omap7xx() /* No known omap7xx boards with vbus sense */
-                );
+                /* No known omap7xx boards with vbus sense */
+                || cpu_is_omap7xx();
 }
 
 static int omap_udc_start(struct usb_gadget_driver *driver,
@@ -2110,7 +2048,7 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
         if (!udc)
                 return -ENODEV;
         if (!driver
-                        // FIXME if otg, check:  driver->is_otg
+                        /* FIXME if otg, check:  driver->is_otg */
                         || driver->max_speed < USB_SPEED_FULL
                         || !bind || !driver->setup)
                 return -EINVAL;
@@ -2122,7 +2060,7 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
         }
 
         /* reset state */
-        list_for_each_entry (ep, &udc->gadget.ep_list, ep.ep_list) {
+        list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) {
                 ep->irqs = 0;
                 if (ep->bmAttributes == USB_ENDPOINT_XFER_ISOC)
                         continue;
@@ -2160,7 +2098,7 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
                 if (status < 0) {
                         ERR("can't bind to transceiver\n");
                         if (driver->unbind) {
-                                driver->unbind (&udc->gadget);
+                                driver->unbind(&udc->gadget);
                                 udc->gadget.dev.driver = NULL;
                                 udc->driver = NULL;
                         }
@@ -2168,9 +2106,9 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
                 }
         } else {
                 if (can_pullup(udc))
-                        pullup_enable (udc);
+                        pullup_enable(udc);
                 else
-                        pullup_disable (udc);
+                        pullup_disable(udc);
         }
 
         /* boards that don't have VBUS sensing can't autogate 48MHz;
@@ -2229,7 +2167,7 @@ static int omap_udc_stop(struct usb_gadget_driver *driver)
 static const char proc_filename[] = "driver/udc";
 
 #define FOURBITS "%s%s%s%s"
-#define EIGHTBITS FOURBITS FOURBITS
+#define EIGHTBITS "%s%s%s%s%s%s%s%s"
 
 static void proc_ep_show(struct seq_file *s, struct omap_ep *ep)
 {
@@ -2251,12 +2189,21 @@ static void proc_ep_show(struct seq_file *s, struct omap_ep *ep)
                 "\n%s %s%s%sirqs %ld stat %04x " EIGHTBITS FOURBITS "%s\n",
                 ep->name, buf,
                 ep->double_buf ? "dbuf " : "",
-                ({char *s; switch(ep->ackwait){
-                case 0: s = ""; break;
-                case 1: s = "(ackw) "; break;
-                case 2: s = "(ackw2) "; break;
-                default: s = "(?) "; break;
-                } s;}),
+                ({ char *s;
+                switch (ep->ackwait) {
+                case 0:
+                        s = "";
+                        break;
+                case 1:
+                        s = "(ackw) ";
+                        break;
+                case 2:
+                        s = "(ackw2) ";
+                        break;
+                default:
+                        s = "(?) ";
+                        break;
+                } s; }),
                 ep->irqs, stat_flg,
                 (stat_flg & UDC_NO_RXPACKET) ? "no_rxpacket " : "",
                 (stat_flg & UDC_MISS_IN) ? "miss_in " : "",
@@ -2272,10 +2219,10 @@ static void proc_ep_show(struct seq_file *s, struct omap_ep *ep)
                 (stat_flg & UDC_NON_ISO_FIFO_EMPTY) ? "fifo_empty " : "",
                 (stat_flg & UDC_NON_ISO_FIFO_FULL) ? "fifo_full " : "");
 
-        if (list_empty (&ep->queue))
+        if (list_empty(&ep->queue))
                 seq_printf(s, "\t(queue empty)\n");
         else
-                list_for_each_entry (req, &ep->queue, queue) {
+                list_for_each_entry(req, &ep->queue, queue) {
                         unsigned        length = req->req.actual;
 
                         if (use_dma && buf[0]) {
@@ -2293,11 +2240,16 @@ static void proc_ep_show(struct seq_file *s, struct omap_ep *ep)
 static char *trx_mode(unsigned m, int enabled)
 {
         switch (m) {
-        case 0:         return enabled ? "*6wire" : "unused";
-        case 1:         return "4wire";
-        case 2:         return "3wire";
-        case 3:         return "6wire";
-        default:        return "unknown";
+        case 0:
+                return enabled ? "*6wire" : "unused";
+        case 1:
+                return "4wire";
+        case 2:
+                return "3wire";
+        case 3:
+                return "6wire";
+        default:
+                return "unknown";
         }
 }
 
@@ -2307,12 +2259,9 @@ static int proc_otg_show(struct seq_file *s)
         u32             trans = 0;
         char            *ctrl_name = "(UNKNOWN)";
 
-        /* XXX This needs major revision for OMAP2+ */
         tmp = omap_readl(OTG_REV);
-        if (cpu_class_is_omap1()) {
-                ctrl_name = "tranceiver_ctrl";
-                trans = omap_readw(USB_TRANSCEIVER_CTRL);
-        }
+        ctrl_name = "tranceiver_ctrl";
+        trans = omap_readw(USB_TRANSCEIVER_CTRL);
         seq_printf(s, "\nOTG rev %d.%d, %s %05x\n",
                 tmp >> 4, tmp & 0xf, ctrl_name, trans);
         tmp = omap_readw(OTG_SYSCON_1);
@@ -2332,7 +2281,7 @@ static int proc_otg_show(struct seq_file *s)
                         " b_ase_brst=%d hmc=%d\n", tmp,
                 (tmp & OTG_EN) ? " otg_en" : "",
                 (tmp & USBX_SYNCHRO) ? " synchro" : "",
-                // much more SRP stuff
+                /* much more SRP stuff */
                 (tmp & SRP_DATA) ? " srp_data" : "",
                 (tmp & SRP_VBUS) ? " srp_vbus" : "",
                 (tmp & OTG_PADEN) ? " otg_paden" : "",
@@ -2399,14 +2348,12 @@ static int proc_udc_show(struct seq_file *s, void *_)
                 HMC,
                 udc->transceiver
                         ? udc->transceiver->label
-                        : ((cpu_is_omap1710() || cpu_is_omap24xx())
+                        : (cpu_is_omap1710()
                                 ? "external" : "(none)"));
-        if (cpu_class_is_omap1()) {
-                seq_printf(s, "ULPD control %04x req %04x status %04x\n",
-                        omap_readw(ULPD_CLOCK_CTRL),
-                        omap_readw(ULPD_SOFT_REQ),
-                        omap_readw(ULPD_STATUS_REQ));
-        }
+        seq_printf(s, "ULPD control %04x req %04x status %04x\n",
+                omap_readw(ULPD_CLOCK_CTRL),
+                omap_readw(ULPD_SOFT_REQ),
+                omap_readw(ULPD_STATUS_REQ));
 
         /* OTG controller registers */
         if (!cpu_is_omap15xx())
@@ -2422,7 +2369,7 @@ static int proc_udc_show(struct seq_file *s, void *_)
                 (tmp & UDC_SELF_PWR) ? " self_pwr" : "",
                 (tmp & UDC_SOFF_DIS) ? " soff_dis" : "",
                 (tmp & UDC_PULLUP_EN) ? " PULLUP" : "");
-        // syscon2 is write-only
+        /* syscon2 is write-only */
 
         /* UDC controller registers */
         if (!(tmp & UDC_PULLUP_EN)) {
@@ -2506,7 +2453,7 @@ static int proc_udc_show(struct seq_file *s, void *_)
         if (tmp & UDC_ATT) {
                 proc_ep_show(s, &udc->ep[0]);
                 if (tmp & UDC_ADD) {
-                        list_for_each_entry (ep, &udc->gadget.ep_list,
+                        list_for_each_entry(ep, &udc->gadget.ep_list,
                                         ep.ep_list) {
                                 if (ep->ep.desc)
                                         proc_ep_show(s, ep);
@@ -2557,7 +2504,7 @@ static inline void remove_proc_file(void) {}
  * UDC_SYSCON_1.CFG_LOCK is set can now work.  We won't use that
  * capability yet though.
  */
-static unsigned __init
+static unsigned __devinit
 omap_ep_setup(char *name, u8 addr, u8 type,
                 unsigned buf, unsigned maxp, int dbuf)
 {
@@ -2575,14 +2522,29 @@ omap_ep_setup(char *name, u8 addr, u8 type,
         /* chip setup ... bit values are same for IN, OUT */
         if (type == USB_ENDPOINT_XFER_ISOC) {
                 switch (maxp) {
-                case 8:         epn_rxtx = 0 << 12; break;
-                case 16:        epn_rxtx = 1 << 12; break;
-                case 32:        epn_rxtx = 2 << 12; break;
-                case 64:        epn_rxtx = 3 << 12; break;
-                case 128:       epn_rxtx = 4 << 12; break;
-                case 256:       epn_rxtx = 5 << 12; break;
-                case 512:       epn_rxtx = 6 << 12; break;
-                default:        BUG();
+                case 8:
+                        epn_rxtx = 0 << 12;
+                        break;
+                case 16:
+                        epn_rxtx = 1 << 12;
+                        break;
+                case 32:
+                        epn_rxtx = 2 << 12;
+                        break;
+                case 64:
+                        epn_rxtx = 3 << 12;
+                        break;
+                case 128:
+                        epn_rxtx = 4 << 12;
+                        break;
+                case 256:
+                        epn_rxtx = 5 << 12;
+                        break;
+                case 512:
+                        epn_rxtx = 6 << 12;
+                        break;
+                default:
+                        BUG();
                 }
                 epn_rxtx |= UDC_EPN_RX_ISO;
                 dbuf = 1;
@@ -2591,15 +2553,24 @@ omap_ep_setup(char *name, u8 addr, u8 type,
                  * and ignored for PIO-IN on newer chips
                  * (for more reliable behavior)
                  */
-                if (!use_dma || cpu_is_omap15xx() || cpu_is_omap24xx())
+                if (!use_dma || cpu_is_omap15xx())
                         dbuf = 0;
 
                 switch (maxp) {
-                case 8:         epn_rxtx = 0 << 12; break;
-                case 16:        epn_rxtx = 1 << 12; break;
-                case 32:        epn_rxtx = 2 << 12; break;
-                case 64:        epn_rxtx = 3 << 12; break;
-                default:        BUG();
+                case 8:
+                        epn_rxtx = 0 << 12;
+                        break;
+                case 16:
+                        epn_rxtx = 1 << 12;
+                        break;
+                case 32:
+                        epn_rxtx = 2 << 12;
+                        break;
+                case 64:
+                        epn_rxtx = 3 << 12;
+                        break;
+                default:
+                        BUG();
                 }
                 if (dbuf && addr)
                         epn_rxtx |= UDC_EPN_RX_DB;
@@ -2639,7 +2610,7 @@ omap_ep_setup(char *name, u8 addr, u8 type,
         ep->ep.name = ep->name;
         ep->ep.ops = &omap_ep_ops;
         ep->ep.maxpacket = ep->maxpacket = maxp;
-        list_add_tail (&ep->ep.ep_list, &udc->gadget.ep_list);
+        list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
 
         return buf;
 }
@@ -2647,11 +2618,11 @@ omap_ep_setup(char *name, u8 addr, u8 type,
 static void omap_udc_release(struct device *dev)
 {
         complete(udc->done);
-        kfree (udc);
+        kfree(udc);
         udc = NULL;
 }
 
-static int __init
+static int __devinit
 omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
 {
         unsigned        tmp, buf;
@@ -2665,13 +2636,13 @@ omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
         omap_writew(0, UDC_TXDMA_CFG);
 
         /* UDC_PULLUP_EN gates the chip clock */
-        // OTG_SYSCON_1 |= DEV_IDLE_EN;
+        /* OTG_SYSCON_1 |= DEV_IDLE_EN; */
 
         udc = kzalloc(sizeof(*udc), GFP_KERNEL);
         if (!udc)
                 return -ENOMEM;
 
-        spin_lock_init (&udc->lock);
+        spin_lock_init(&udc->lock);
 
         udc->gadget.ops = &omap_gadget_ops;
         udc->gadget.ep0 = &udc->ep[0].ep;
@@ -2701,13 +2672,13 @@ omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
                 omap_writew(0, UDC_EP_TX(tmp));
         }
 
-#define OMAP_BULK_EP(name,addr) \
+#define OMAP_BULK_EP(name, addr) \
         buf = omap_ep_setup(name "-bulk", addr, \
                         USB_ENDPOINT_XFER_BULK, buf, 64, 1);
-#define OMAP_INT_EP(name,addr, maxp) \
+#define OMAP_INT_EP(name, addr, maxp) \
         buf = omap_ep_setup(name "-int", addr, \
                         USB_ENDPOINT_XFER_INT, buf, maxp, 0);
-#define OMAP_ISO_EP(name,addr, maxp) \
+#define OMAP_ISO_EP(name, addr, maxp) \
         buf = omap_ep_setup(name "-iso", addr, \
                         USB_ENDPOINT_XFER_ISOC, buf, maxp, 1);
 
@@ -2788,15 +2759,18 @@ omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
         return 0;
 }
 
-static int __init omap_udc_probe(struct platform_device *pdev)
+static int __devinit omap_udc_probe(struct platform_device *pdev)
 {
         int                     status = -ENODEV;
         int                     hmc;
         struct usb_phy          *xceiv = NULL;
         const char              *type = NULL;
         struct omap_usb_config  *config = pdev->dev.platform_data;
-        struct clk              *dc_clk;
-        struct clk              *hhc_clk;
+        struct clk              *dc_clk = NULL;
+        struct clk              *hhc_clk = NULL;
+
+        if (cpu_is_omap7xx())
+                use_dma = 0;
 
         /* NOTE:  "knows" the order of the resources! */
         if (!request_mem_region(pdev->resource[0].start,
@@ -2816,16 +2790,6 @@ static int __init omap_udc_probe(struct platform_device *pdev)
                 udelay(100);
         }
 
-        if (cpu_is_omap24xx()) {
-                dc_clk = clk_get(&pdev->dev, "usb_fck");
-                hhc_clk = clk_get(&pdev->dev, "usb_l4_ick");
-                BUG_ON(IS_ERR(dc_clk) || IS_ERR(hhc_clk));
-                /* can't use omap_udc_enable_clock yet */
-                clk_enable(dc_clk);
-                clk_enable(hhc_clk);
-                udelay(100);
-        }
-
         if (cpu_is_omap7xx()) {
                 dc_clk = clk_get(&pdev->dev, "usb_dc_ck");
                 hhc_clk = clk_get(&pdev->dev, "l3_ocpi_ck");
@@ -2875,14 +2839,6 @@ static int __init omap_udc_probe(struct platform_device *pdev)
 
                 hmc = HMC_1610;
 
-                if (cpu_is_omap24xx()) {
-                        /* this could be transceiverless in one of the
-                         * "we don't need to know" modes.
-                         */
-                        type = "external";
-                        goto known;
-                }
-
                 switch (hmc) {
                 case 0:                 /* POWERUP DEFAULT == 0 */
                 case 4:
@@ -2921,16 +2877,16 @@ bad_on_1710:
                         goto cleanup0;
                 }
         }
-known:
+
         INFO("hmc mode %d, %s transceiver\n", hmc, type);
 
         /* a "gadget" abstracts/virtualizes the controller */
         status = omap_udc_setup(pdev, xceiv);
-        if (status) {
+        if (status)
                 goto cleanup0;
-        }
+
         xceiv = NULL;
-        // "udc" is now valid
+        /* "udc" is now valid */
         pullup_disable(udc);
 #if     defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         udc->gadget.is_otg = (config->otg != 0);
@@ -2944,7 +2900,7 @@ known:
 
         /* USB general purpose IRQ:  ep0, state changes, dma, etc */
         status = request_irq(pdev->resource[1].start, omap_udc_irq,
-                        IRQF_SAMPLE_RANDOM, driver_name, udc);
+                        0, driver_name, udc);
         if (status != 0) {
                 ERR("can't get irq %d, err %d\n",
                         (int) pdev->resource[1].start, status);
@@ -2953,7 +2909,7 @@ known:
 
         /* USB "non-iso" IRQ (PIO for all but ep0) */
         status = request_irq(pdev->resource[2].start, omap_udc_pio_irq,
-                        IRQF_SAMPLE_RANDOM, "omap_udc pio", udc);
+                        0, "omap_udc pio", udc);
         if (status != 0) {
                 ERR("can't get irq %d, err %d\n",
                         (int) pdev->resource[2].start, status);
@@ -2975,16 +2931,6 @@ known:
                 clk_disable(dc_clk);
         }
 
-        if (cpu_is_omap24xx()) {
-                udc->dc_clk = dc_clk;
-                udc->hhc_clk = hhc_clk;
-                /* FIXME OMAP2 don't release hhc & dc clock */
-#if 0
-                clk_disable(hhc_clk);
-                clk_disable(dc_clk);
-#endif
-        }
-
         create_proc_file();
         status = device_add(&udc->gadget.dev);
         if (status)
@@ -3006,14 +2952,14 @@ cleanup2:
         free_irq(pdev->resource[1].start, udc);
 
 cleanup1:
-        kfree (udc);
+        kfree(udc);
         udc = NULL;
 
 cleanup0:
         if (xceiv)
                 usb_put_transceiver(xceiv);
 
-        if (cpu_is_omap16xx() || cpu_is_omap24xx() || cpu_is_omap7xx()) {
+        if (cpu_is_omap16xx() || cpu_is_omap7xx()) {
                 clk_disable(hhc_clk);
                 clk_disable(dc_clk);
                 clk_put(hhc_clk);
@@ -3026,7 +2972,7 @@ cleanup0:
         return status;
 }
 
-static int __exit omap_udc_remove(struct platform_device *pdev)
+static int __devexit omap_udc_remove(struct platform_device *pdev)
 {
         DECLARE_COMPLETION_ONSTACK(done);
 
@@ -3111,7 +3057,8 @@ static int omap_udc_resume(struct platform_device *dev)
 /*-------------------------------------------------------------------------*/
 
 static struct platform_driver udc_driver = {
-        .remove         = __exit_p(omap_udc_remove),
+        .probe          = omap_udc_probe,
+        .remove         = __devexit_p(omap_udc_remove),
         .suspend        = omap_udc_suspend,
         .resume         = omap_udc_resume,
         .driver         = {
@@ -3120,27 +3067,7 @@ static struct platform_driver udc_driver = {
         },
 };
 
-static int __init udc_init(void)
-{
-        /* Disable DMA for omap7xx -- it doesn't work right. */
-        if (cpu_is_omap7xx())
-                use_dma = 0;
-
-        INFO("%s, version: " DRIVER_VERSION
-#ifdef  USE_ISO
-                " (iso)"
-#endif
-                "%s\n", driver_desc,
-                use_dma ?  " (dma)" : "");
-        return platform_driver_probe(&udc_driver, omap_udc_probe);
-}
-module_init(udc_init);
-
-static void __exit udc_exit(void)
-{
-        platform_driver_unregister(&udc_driver);
-}
-module_exit(udc_exit);
+module_platform_driver(udc_driver);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 1cfcc9ecbfbc..f4fb71c9ae08 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -2208,7 +2208,7 @@ static void pch_udc_complete_receiver(struct pch_udc_ep *ep)
                         return;
                 }
                 if ((td->status & PCH_UDC_BUFF_STS) == PCH_UDC_BS_DMA_DONE)
-                        if (td->status | PCH_UDC_DMA_LAST) {
+                        if (td->status & PCH_UDC_DMA_LAST) {
                                 count = td->status & PCH_UDC_RXTX_BYTES;
                                 break;
                         }
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index f4abb0ed9872..b13e0bb5f5b8 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -112,7 +112,6 @@ struct s3c_hsotg_ep {
         struct s3c_hsotg_req    *req;
         struct dentry           *debugfs;
 
-        spinlock_t              lock;
 
         unsigned long           total_data;
         unsigned int            size_loaded;
@@ -136,7 +135,6 @@ struct s3c_hsotg_ep {
  * @driver: USB gadget driver
  * @plat: The platform specific configuration data.
  * @regs: The memory area mapped for accessing registers.
- * @regs_res: The resource that was allocated when claiming register space.
  * @irq: The IRQ number we are using
  * @supplies: Definition of USB power supplies
  * @dedicated_fifos: Set if the hardware has dedicated IN-EP fifos.
@@ -157,8 +155,9 @@ struct s3c_hsotg {
         struct usb_gadget_driver *driver;
         struct s3c_hsotg_plat    *plat;
 
+        spinlock_t              lock;
+
         void __iomem            *regs;
-        struct resource         *regs_res;
         int                     irq;
         struct clk              *clk;
 
@@ -896,7 +895,6 @@ static int s3c_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req,
         struct s3c_hsotg_req *hs_req = our_req(req);
         struct s3c_hsotg_ep *hs_ep = our_ep(ep);
         struct s3c_hsotg *hs = hs_ep->parent;
-        unsigned long irqflags;
         bool first;
 
         dev_dbg(hs->dev, "%s: req %p: %d@%p, noi=%d, zero=%d, snok=%d\n",
@@ -915,19 +913,30 @@ static int s3c_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req,
                         return ret;
         }
 
-        spin_lock_irqsave(&hs_ep->lock, irqflags);
-
         first = list_empty(&hs_ep->queue);
         list_add_tail(&hs_req->queue, &hs_ep->queue);
 
         if (first)
                 s3c_hsotg_start_req(hs, hs_ep, hs_req, false);
 
-        spin_unlock_irqrestore(&hs_ep->lock, irqflags);
-
         return 0;
 }
 
+static int s3c_hsotg_ep_queue_lock(struct usb_ep *ep, struct usb_request *req,
+                              gfp_t gfp_flags)
+{
+        struct s3c_hsotg_ep *hs_ep = our_ep(ep);
+        struct s3c_hsotg *hs = hs_ep->parent;
+        unsigned long flags = 0;
+        int ret = 0;
+
+        spin_lock_irqsave(&hs->lock, flags);
+        ret = s3c_hsotg_ep_queue(ep, req, gfp_flags);
+        spin_unlock_irqrestore(&hs->lock, flags);
+
+        return ret;
+}
+
 static void s3c_hsotg_ep_free_request(struct usb_ep *ep,
                                       struct usb_request *req)
 {
@@ -1383,9 +1392,9 @@ static void s3c_hsotg_complete_request(struct s3c_hsotg *hsotg,
          */
 
         if (hs_req->req.complete) {
-                spin_unlock(&hs_ep->lock);
+                spin_unlock(&hsotg->lock);
                 hs_req->req.complete(&hs_ep->ep, &hs_req->req);
-                spin_lock(&hs_ep->lock);
+                spin_lock(&hsotg->lock);
         }
 
         /*
@@ -1404,28 +1413,6 @@ static void s3c_hsotg_complete_request(struct s3c_hsotg *hsotg,
 }
 
 /**
- * s3c_hsotg_complete_request_lock - complete a request given to us (locked)
- * @hsotg: The device state.
- * @hs_ep: The endpoint the request was on.
- * @hs_req: The request to complete.
- * @result: The result code (0 => Ok, otherwise errno)
- *
- * See s3c_hsotg_complete_request(), but called with the endpoint's
- * lock held.
- */
-static void s3c_hsotg_complete_request_lock(struct s3c_hsotg *hsotg,
-                                            struct s3c_hsotg_ep *hs_ep,
-                                            struct s3c_hsotg_req *hs_req,
-                                            int result)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&hs_ep->lock, flags);
-        s3c_hsotg_complete_request(hsotg, hs_ep, hs_req, result);
-        spin_unlock_irqrestore(&hs_ep->lock, flags);
-}
-
-/**
  * s3c_hsotg_rx_data - receive data from the FIFO for an endpoint
  * @hsotg: The device state.
  * @ep_idx: The endpoint index for the data
@@ -1444,6 +1431,7 @@ static void s3c_hsotg_rx_data(struct s3c_hsotg *hsotg, int ep_idx, int size)
         int max_req;
         int read_ptr;
 
+
         if (!hs_req) {
                 u32 epctl = readl(hsotg->regs + DOEPCTL(ep_idx));
                 int ptr;
@@ -1459,8 +1447,6 @@ static void s3c_hsotg_rx_data(struct s3c_hsotg *hsotg, int ep_idx, int size)
                 return;
         }
 
-        spin_lock(&hs_ep->lock);
-
         to_read = size;
         read_ptr = hs_req->req.actual;
         max_req = hs_req->req.length - read_ptr;
@@ -1487,8 +1473,6 @@ static void s3c_hsotg_rx_data(struct s3c_hsotg *hsotg, int ep_idx, int size)
          * alignment of the data.
          */
         readsl(fifo, hs_req->req.buf + read_ptr, to_read);
-
-        spin_unlock(&hs_ep->lock);
 }
 
 /**
@@ -1609,7 +1593,7 @@ static void s3c_hsotg_handle_outdone(struct s3c_hsotg *hsotg,
                         s3c_hsotg_send_zlp(hsotg, hs_req);
         }
 
-        s3c_hsotg_complete_request_lock(hsotg, hs_ep, hs_req, result);
+        s3c_hsotg_complete_request(hsotg, hs_ep, hs_req, result);
 }
 
 /**
@@ -1864,7 +1848,7 @@ static void s3c_hsotg_complete_in(struct s3c_hsotg *hsotg,
         /* Finish ZLP handling for IN EP0 transactions */
         if (hsotg->eps[0].sent_zlp) {
                 dev_dbg(hsotg->dev, "zlp packet received\n");
-                s3c_hsotg_complete_request_lock(hsotg, hs_ep, hs_req, 0);
+                s3c_hsotg_complete_request(hsotg, hs_ep, hs_req, 0);
                 return;
         }
 
@@ -1915,7 +1899,7 @@ static void s3c_hsotg_complete_in(struct s3c_hsotg *hsotg,
                 dev_dbg(hsotg->dev, "%s trying more for req...\n", __func__);
                 s3c_hsotg_start_req(hsotg, hs_ep, hs_req, true);
         } else
-                s3c_hsotg_complete_request_lock(hsotg, hs_ep, hs_req, 0);
+                s3c_hsotg_complete_request(hsotg, hs_ep, hs_req, 0);
 }
 
 /**
@@ -2123,9 +2107,6 @@ static void kill_all_requests(struct s3c_hsotg *hsotg,
                               int result, bool force)
 {
         struct s3c_hsotg_req *req, *treq;
-        unsigned long flags;
-
-        spin_lock_irqsave(&ep->lock, flags);
 
         list_for_each_entry_safe(req, treq, &ep->queue, queue) {
                 /*
@@ -2139,14 +2120,15 @@ static void kill_all_requests(struct s3c_hsotg *hsotg,
                 s3c_hsotg_complete_request(hsotg, ep, req,
                                            result);
         }
-
-        spin_unlock_irqrestore(&ep->lock, flags);
 }
 
 #define call_gadget(_hs, _entry) \
         if ((_hs)->gadget.speed != USB_SPEED_UNKNOWN && \
-            (_hs)->driver && (_hs)->driver->_entry)     \
-                (_hs)->driver->_entry(&(_hs)->gadget);
+            (_hs)->driver && (_hs)->driver->_entry) { \
+                spin_unlock(&_hs->lock); \
+                (_hs)->driver->_entry(&(_hs)->gadget); \
+                spin_lock(&_hs->lock); \
+                }
 
 /**
  * s3c_hsotg_disconnect - disconnect service
@@ -2388,6 +2370,7 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw)
         u32 gintsts;
         u32 gintmsk;
 
+        spin_lock(&hsotg->lock);
 irq_retry:
         gintsts = readl(hsotg->regs + GINTSTS);
         gintmsk = readl(hsotg->regs + GINTMSK);
@@ -2557,6 +2540,8 @@ irq_retry:
         if (gintsts & IRQ_RETRY_MASK && --retry_count > 0)
                         goto irq_retry;
 
+        spin_unlock(&hsotg->lock);
+
         return IRQ_HANDLED;
 }
 
@@ -2604,7 +2589,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
         dev_dbg(hsotg->dev, "%s: read DxEPCTL=0x%08x from 0x%08x\n",
                 __func__, epctrl, epctrl_reg);
 
-        spin_lock_irqsave(&hs_ep->lock, flags);
+        spin_lock_irqsave(&hsotg->lock, flags);
 
         epctrl &= ~(DxEPCTL_EPType_MASK | DxEPCTL_MPS_MASK);
         epctrl |= DxEPCTL_MPS(mps);
@@ -2683,7 +2668,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
         s3c_hsotg_ctrl_epint(hsotg, index, dir_in, 1);
 
 out:
-        spin_unlock_irqrestore(&hs_ep->lock, flags);
+        spin_unlock_irqrestore(&hsotg->lock, flags);
         return ret;
 }
 
@@ -2710,10 +2695,10 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep)
 
         epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index);
 
+        spin_lock_irqsave(&hsotg->lock, flags);
         /* terminate all requests with shutdown */
         kill_all_requests(hsotg, hs_ep, -ESHUTDOWN, false);
 
-        spin_lock_irqsave(&hs_ep->lock, flags);
 
         ctrl = readl(hsotg->regs + epctrl_reg);
         ctrl &= ~DxEPCTL_EPEna;
@@ -2726,7 +2711,7 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep)
         /* disable endpoint interrupts */
         s3c_hsotg_ctrl_epint(hsotg, hs_ep->index, hs_ep->dir_in, 0);
 
-        spin_unlock_irqrestore(&hs_ep->lock, flags);
+        spin_unlock_irqrestore(&hsotg->lock, flags);
         return 0;
 }
 
@@ -2761,15 +2746,15 @@ static int s3c_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req)
 
         dev_info(hs->dev, "ep_dequeue(%p,%p)\n", ep, req);
 
-        spin_lock_irqsave(&hs_ep->lock, flags);
+        spin_lock_irqsave(&hs->lock, flags);
 
         if (!on_list(hs_ep, hs_req)) {
-                spin_unlock_irqrestore(&hs_ep->lock, flags);
+                spin_unlock_irqrestore(&hs->lock, flags);
                 return -EINVAL;
         }
 
         s3c_hsotg_complete_request(hs, hs_ep, hs_req, -ECONNRESET);
-        spin_unlock_irqrestore(&hs_ep->lock, flags);
+        spin_unlock_irqrestore(&hs->lock, flags);
 
         return 0;
 }
@@ -2784,15 +2769,12 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value)
         struct s3c_hsotg_ep *hs_ep = our_ep(ep);
         struct s3c_hsotg *hs = hs_ep->parent;
         int index = hs_ep->index;
-        unsigned long irqflags;
         u32 epreg;
         u32 epctl;
         u32 xfertype;
 
         dev_info(hs->dev, "%s(ep %p %s, %d)\n", __func__, ep, ep->name, value);
 
-        spin_lock_irqsave(&hs_ep->lock, irqflags);
-
         /* write both IN and OUT control registers */
 
         epreg = DIEPCTL(index);
@@ -2827,19 +2809,36 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value)
 
         writel(epctl, hs->regs + epreg);
 
-        spin_unlock_irqrestore(&hs_ep->lock, irqflags);
-
         return 0;
 }
 
+/**
+ * s3c_hsotg_ep_sethalt_lock - set halt on a given endpoint with lock held
+ * @ep: The endpoint to set halt.
+ * @value: Set or unset the halt.
+ */
+static int s3c_hsotg_ep_sethalt_lock(struct usb_ep *ep, int value)
+{
+        struct s3c_hsotg_ep *hs_ep = our_ep(ep);
+        struct s3c_hsotg *hs = hs_ep->parent;
+        unsigned long flags = 0;
+        int ret = 0;
+
+        spin_lock_irqsave(&hs->lock, flags);
+        ret = s3c_hsotg_ep_sethalt(ep, value);
+        spin_unlock_irqrestore(&hs->lock, flags);
+
+        return ret;
+}
+
 static struct usb_ep_ops s3c_hsotg_ep_ops = {
         .enable         = s3c_hsotg_ep_enable,
         .disable        = s3c_hsotg_ep_disable,
         .alloc_request  = s3c_hsotg_ep_alloc_request,
         .free_request   = s3c_hsotg_ep_free_request,
-        .queue          = s3c_hsotg_ep_queue,
+        .queue          = s3c_hsotg_ep_queue_lock,
         .dequeue        = s3c_hsotg_ep_dequeue,
-        .set_halt       = s3c_hsotg_ep_sethalt,
+        .set_halt       = s3c_hsotg_ep_sethalt_lock,
         /* note, don't believe we have any call for the fifo routines */
 };
 
@@ -2954,6 +2953,7 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
         driver->driver.bus = NULL;
         hsotg->driver = driver;
         hsotg->gadget.dev.driver = &driver->driver;
+        hsotg->gadget.dev.of_node = hsotg->dev->of_node;
         hsotg->gadget.dev.dma_mask = hsotg->dev->dma_mask;
         hsotg->gadget.speed = USB_SPEED_UNKNOWN;
 
@@ -2964,9 +2964,6 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
                 goto err;
         }
 
-        s3c_hsotg_phy_enable(hsotg);
-
-        s3c_hsotg_core_init(hsotg);
         hsotg->last_rst = jiffies;
         dev_info(hsotg->dev, "bound driver %s\n", driver->driver.name);
         return 0;
@@ -2988,6 +2985,7 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
                           struct usb_gadget_driver *driver)
 {
         struct s3c_hsotg *hsotg = to_hsotg(gadget);
+        unsigned long flags = 0;
         int ep;
 
         if (!hsotg)
@@ -3000,6 +2998,8 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
         for (ep = 0; ep < hsotg->num_of_eps; ep++)
                 s3c_hsotg_ep_disable(&hsotg->eps[ep].ep);
 
+        spin_lock_irqsave(&hsotg->lock, flags);
+
         s3c_hsotg_phy_disable(hsotg);
         regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
 
@@ -3007,6 +3007,8 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
         hsotg->gadget.speed = USB_SPEED_UNKNOWN;
         hsotg->gadget.dev.driver = NULL;
 
+        spin_unlock_irqrestore(&hsotg->lock, flags);
+
         dev_info(hsotg->dev, "unregistered gadget driver '%s'\n",
                  driver->driver.name);
 
@@ -3024,10 +3026,40 @@ static int s3c_hsotg_gadget_getframe(struct usb_gadget *gadget)
         return s3c_hsotg_read_frameno(to_hsotg(gadget));
 }
 
+/**
+ * s3c_hsotg_pullup - connect/disconnect the USB PHY
+ * @gadget: The usb gadget state
+ * @is_on: Current state of the USB PHY
+ *
+ * Connect/Disconnect the USB PHY pullup
+ */
+static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on)
+{
+        struct s3c_hsotg *hsotg = to_hsotg(gadget);
+        unsigned long flags = 0;
+
+        dev_dbg(hsotg->dev, "%s: is_in: %d\n", __func__, is_on);
+
+        spin_lock_irqsave(&hsotg->lock, flags);
+        if (is_on) {
+                s3c_hsotg_phy_enable(hsotg);
+                s3c_hsotg_core_init(hsotg);
+        } else {
+                s3c_hsotg_disconnect(hsotg);
+                s3c_hsotg_phy_disable(hsotg);
+        }
+
+        hsotg->gadget.speed = USB_SPEED_UNKNOWN;
+        spin_unlock_irqrestore(&hsotg->lock, flags);
+
+        return 0;
+}
+
 static struct usb_gadget_ops s3c_hsotg_gadget_ops = {
         .get_frame      = s3c_hsotg_gadget_getframe,
         .udc_start              = s3c_hsotg_udc_start,
         .udc_stop               = s3c_hsotg_udc_stop,
+        .pullup                 = s3c_hsotg_pullup,
 };
 
 /**
@@ -3063,8 +3095,6 @@ static void __devinit s3c_hsotg_initep(struct s3c_hsotg *hsotg,
         INIT_LIST_HEAD(&hs_ep->queue);
         INIT_LIST_HEAD(&hs_ep->ep.ep_list);
 
-        spin_lock_init(&hs_ep->lock);
-
         /* add to the list of endpoints known by the gadget driver */
         if (epnum)
                 list_add_tail(&hs_ep->ep.ep_list, &hsotg->gadget.ep_list);
@@ -3342,7 +3372,7 @@ static int ep_show(struct seq_file *seq, void *v)
         seq_printf(seq, "request list (%p,%p):\n",
                    ep->queue.next, ep->queue.prev);
 
-        spin_lock_irqsave(&ep->lock, flags);
+        spin_lock_irqsave(&hsotg->lock, flags);
 
         list_for_each_entry(req, &ep->queue, queue) {
                 if (--show_limit < 0) {
@@ -3357,7 +3387,7 @@ static int ep_show(struct seq_file *seq, void *v)
                            req->req.actual, req->req.status);
         }
 
-        spin_unlock_irqrestore(&ep->lock, flags);
+        spin_unlock_irqrestore(&hsotg->lock, flags);
 
         return 0;
 }
@@ -3477,7 +3507,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        hsotg = kzalloc(sizeof(struct s3c_hsotg), GFP_KERNEL);
+        hsotg = devm_kzalloc(&pdev->dev, sizeof(struct s3c_hsotg), GFP_KERNEL);
         if (!hsotg) {
                 dev_err(dev, "cannot get memory\n");
                 return -ENOMEM;
@@ -3489,46 +3519,35 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
         hsotg->clk = clk_get(&pdev->dev, "otg");
         if (IS_ERR(hsotg->clk)) {
                 dev_err(dev, "cannot get otg clock\n");
-                ret = PTR_ERR(hsotg->clk);
-                goto err_mem;
+                return PTR_ERR(hsotg->clk);
         }
 
         platform_set_drvdata(pdev, hsotg);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(dev, "cannot find register resource 0\n");
-                ret = -EINVAL;
-                goto err_clk;
-        }
-
-        hsotg->regs_res = request_mem_region(res->start, resource_size(res),
-                                             dev_name(dev));
-        if (!hsotg->regs_res) {
-                dev_err(dev, "cannot reserve registers\n");
-                ret = -ENOENT;
-                goto err_clk;
-        }
 
-        hsotg->regs = ioremap(res->start, resource_size(res));
+        hsotg->regs = devm_request_and_ioremap(&pdev->dev, res);
         if (!hsotg->regs) {
                 dev_err(dev, "cannot map registers\n");
                 ret = -ENXIO;
-                goto err_regs_res;
+                goto err_clk;
         }
 
         ret = platform_get_irq(pdev, 0);
         if (ret < 0) {
                 dev_err(dev, "cannot find IRQ\n");
-                goto err_regs;
+                goto err_clk;
         }
 
+        spin_lock_init(&hsotg->lock);
+
         hsotg->irq = ret;
 
-        ret = request_irq(ret, s3c_hsotg_irq, 0, dev_name(dev), hsotg);
+        ret = devm_request_irq(&pdev->dev, hsotg->irq, s3c_hsotg_irq, 0,
+                                dev_name(dev), hsotg);
         if (ret < 0) {
                 dev_err(dev, "cannot claim IRQ\n");
-                goto err_regs;
+                goto err_clk;
         }
 
         dev_info(dev, "regs %p, irq %d\n", hsotg->regs, hsotg->irq);
@@ -3558,7 +3577,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
                                  hsotg->supplies);
         if (ret) {
                 dev_err(dev, "failed to request supplies: %d\n", ret);
-                goto err_irq;
+                goto err_clk;
         }
 
         ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies),
@@ -3642,19 +3661,11 @@ err_ep_mem:
 err_supplies:
         s3c_hsotg_phy_disable(hsotg);
         regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
-err_irq:
-        free_irq(hsotg->irq, hsotg);
-err_regs:
-        iounmap(hsotg->regs);
-
-err_regs_res:
-        release_resource(hsotg->regs_res);
-        kfree(hsotg->regs_res);
+
 err_clk:
         clk_disable_unprepare(hsotg->clk);
         clk_put(hsotg->clk);
-err_mem:
-        kfree(hsotg);
+
         return ret;
 }
 
@@ -3675,12 +3686,6 @@ static int __devexit s3c_hsotg_remove(struct platform_device *pdev)
                 usb_gadget_unregister_driver(hsotg->driver);
         }
 
-        free_irq(hsotg->irq, hsotg);
-        iounmap(hsotg->regs);
-
-        release_resource(hsotg->regs_res);
-        kfree(hsotg->regs_res);
-
         s3c_hsotg_phy_disable(hsotg);
         regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
 
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 8081ca3a70a2..ae8b18869b8c 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -38,12 +38,6 @@
  */
 
 /*
- * When FSG_BUFFHD_STATIC_BUFFER is defined when this file is included
- * the fsg_buffhd structure's buf field will be an array of FSG_BUFLEN
- * characters rather then a pointer to void.
- */
-
-/*
  * When USB_GADGET_DEBUG_FILES is defined the module param num_buffers
  * sets the number of pipeline buffers (length of the fsg_buffhd array).
  * The valid range of num_buffers is: num >= 2 && num <= 4.
@@ -260,11 +254,7 @@ enum fsg_buffer_state {
 };
 
 struct fsg_buffhd {
-#ifdef FSG_BUFFHD_STATIC_BUFFER
-        char                            buf[FSG_BUFLEN];
-#else
         void                            *buf;
-#endif
         enum fsg_buffer_state           state;
         struct fsg_buffhd               *next;
 
@@ -627,6 +617,16 @@ static struct usb_gadget_strings	fsg_stringtab = {
  * the caller must own fsg->filesem for writing.
  */
 
+static void fsg_lun_close(struct fsg_lun *curlun)
+{
+        if (curlun->filp) {
+                LDBG(curlun, "close backing file\n");
+                fput(curlun->filp);
+                curlun->filp = NULL;
+        }
+}
+
+
 static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
 {
         int                             ro;
@@ -636,6 +636,8 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         loff_t                          size;
         loff_t                          num_sectors;
         loff_t                          min_sectors;
+        unsigned int                    blkbits;
+        unsigned int                    blksize;
 
         /* R/W if we can, R/O if we must */
         ro = curlun->initially_ro;
@@ -680,17 +682,17 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         }
 
         if (curlun->cdrom) {
-                curlun->blksize = 2048;
-                curlun->blkbits = 11;
+                blksize = 2048;
+                blkbits = 11;
         } else if (inode->i_bdev) {
-                curlun->blksize = bdev_logical_block_size(inode->i_bdev);
-                curlun->blkbits = blksize_bits(curlun->blksize);
+                blksize = bdev_logical_block_size(inode->i_bdev);
+                blkbits = blksize_bits(blksize);
         } else {
-                curlun->blksize = 512;
-                curlun->blkbits = 9;
+                blksize = 512;
+                blkbits = 9;
         }
 
-        num_sectors = size >> curlun->blkbits; /* File size in logic-block-size blocks */
+        num_sectors = size >> blkbits; /* File size in logic-block-size blocks */
         min_sectors = 1;
         if (curlun->cdrom) {
                 min_sectors = 300;      /* Smallest track is 300 frames */
@@ -707,7 +709,12 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
                 goto out;
         }
 
+        if (fsg_lun_is_open(curlun))
+                fsg_lun_close(curlun);
+
         get_file(filp);
+        curlun->blksize = blksize;
+        curlun->blkbits = blkbits;
         curlun->ro = ro;
         curlun->filp = filp;
         curlun->file_length = size;
@@ -721,16 +728,6 @@ out:
 }
 
 
-static void fsg_lun_close(struct fsg_lun *curlun)
-{
-        if (curlun->filp) {
-                LDBG(curlun, "close backing file\n");
-                fput(curlun->filp);
-                curlun->filp = NULL;
-        }
-}
-
-
 /*-------------------------------------------------------------------------*/
 
 /*
@@ -881,19 +878,17 @@ static ssize_t fsg_store_file(struct device *dev, struct device_attribute *attr,
         if (count > 0 && buf[count-1] == '\n')
                 ((char *) buf)[count-1] = 0;            /* Ugh! */
 
-        /* Eject current medium */
-        down_write(filesem);
-        if (fsg_lun_is_open(curlun)) {
-                fsg_lun_close(curlun);
-                curlun->unit_attention_data = SS_MEDIUM_NOT_PRESENT;
-        }
-
         /* Load new medium */
+        down_write(filesem);
         if (count > 0 && buf[0]) {
+                /* fsg_lun_open() will close existing file if any. */
                 rc = fsg_lun_open(curlun, buf);
                 if (rc == 0)
                         curlun->unit_attention_data =
                                         SS_NOT_READY_TO_READY_TRANSITION;
+        } else if (fsg_lun_is_open(curlun)) {
+                fsg_lun_close(curlun);
+                curlun->unit_attention_data = SS_MEDIUM_NOT_PRESENT;
         }
         up_write(filesem);
         return (rc < 0 ? rc : count);
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 47cf48b51c9d..5b46f022d0f0 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -798,12 +798,6 @@ int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
 
         SET_ETHTOOL_OPS(net, &ops);
 
-        /* two kinds of host-initiated state changes:
-         *  - iff DATA transfer is active, carrier is "on"
-         *  - tx queueing enabled if open *and* carrier is "on"
-         */
-        netif_carrier_off(net);
-
         dev->gadget = g;
         SET_NETDEV_DEV(net, &g->dev);
         SET_NETDEV_DEVTYPE(net, &gadget_type);
@@ -817,6 +811,12 @@ int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
                 INFO(dev, "HOST MAC %pM\n", dev->host_mac);
 
                 the_dev = dev;
+
+                /* two kinds of host-initiated state changes:
+                 *  - iff DATA transfer is active, carrier is "on"
+                 *  - tx queueing enabled if open *and* carrier is "on"
+                 */
+                netif_carrier_off(net);
         }
 
         return status;
diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
index ca4e03a1c73a..93b0c1191115 100644
--- a/drivers/usb/gadget/uvc.h
+++ b/drivers/usb/gadget/uvc.h
@@ -153,9 +153,11 @@ struct uvc_device
 
         /* Descriptors */
         struct {
-                const struct uvc_descriptor_header * const *control;
+                const struct uvc_descriptor_header * const *fs_control;
+                const struct uvc_descriptor_header * const *ss_control;
                 const struct uvc_descriptor_header * const *fs_streaming;
                 const struct uvc_descriptor_header * const *hs_streaming;
+                const struct uvc_descriptor_header * const *ss_streaming;
         } desc;
 
         unsigned int control_intf;
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c
index 668fe128f2ef..120e134e805e 100644
--- a/drivers/usb/gadget/webcam.c
+++ b/drivers/usb/gadget/webcam.c
@@ -272,7 +272,15 @@ static const struct uvc_color_matching_descriptor uvc_color_matching = {
         .bMatrixCoefficients    = 4,
 };
 
-static const struct uvc_descriptor_header * const uvc_control_cls[] = {
+static const struct uvc_descriptor_header * const uvc_fs_control_cls[] = {
+        (const struct uvc_descriptor_header *) &uvc_control_header,
+        (const struct uvc_descriptor_header *) &uvc_camera_terminal,
+        (const struct uvc_descriptor_header *) &uvc_processing,
+        (const struct uvc_descriptor_header *) &uvc_output_terminal,
+        NULL,
+};
+
+static const struct uvc_descriptor_header * const uvc_ss_control_cls[] = {
         (const struct uvc_descriptor_header *) &uvc_control_header,
         (const struct uvc_descriptor_header *) &uvc_camera_terminal,
         (const struct uvc_descriptor_header *) &uvc_processing,
@@ -304,6 +312,18 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = {
         NULL,
 };
 
+static const struct uvc_descriptor_header * const uvc_ss_streaming_cls[] = {
+        (const struct uvc_descriptor_header *) &uvc_input_header,
+        (const struct uvc_descriptor_header *) &uvc_format_yuv,
+        (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
+        (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
+        (const struct uvc_descriptor_header *) &uvc_format_mjpg,
+        (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
+        (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
+        (const struct uvc_descriptor_header *) &uvc_color_matching,
+        NULL,
+};
+
 /* --------------------------------------------------------------------------
  * USB configuration
  */
@@ -311,8 +331,9 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = {
 static int __init
 webcam_config_bind(struct usb_configuration *c)
 {
-        return uvc_bind_config(c, uvc_control_cls, uvc_fs_streaming_cls,
-                               uvc_hs_streaming_cls);
+        return uvc_bind_config(c, uvc_fs_control_cls, uvc_ss_control_cls,
+                uvc_fs_streaming_cls, uvc_hs_streaming_cls,
+                uvc_ss_streaming_cls);
 }
 
 static struct usb_configuration webcam_config_driver = {
@@ -373,7 +394,7 @@ static struct usb_composite_driver webcam_driver = {
         .name           = "g_webcam",
         .dev            = &webcam_device_descriptor,
         .strings        = webcam_device_strings,
-        .max_speed      = USB_SPEED_HIGH,
+        .max_speed      = USB_SPEED_SUPER,
         .unbind         = webcam_unbind,
 };