Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB merge for 3.9-rc1

  Nothing major, lots of gadget fixes, and of course, xhci stuff.

  All of this has been in linux-next for a while, with the exception of
  the last 3 patches, which were reverts of patches in the tree that
  caused problems, they went in yesterday."

* tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits)
  Revert "USB: EHCI: make ehci-vt8500 a separate driver"
  Revert "USB: EHCI: make ehci-orion a separate driver"
  Revert "USB: update host controller Kconfig entries"
  USB: update host controller Kconfig entries
  USB: EHCI: make ehci-orion a separate driver
  USB: EHCI: make ehci-vt8500 a separate driver
  USB: usb-storage: unusual_devs update for Super TOP SATA bridge
  USB: ehci-omap: Fix autoloading of module
  USB: ehci-omap: Don't free gpios that we didn't request
  USB: option: add Huawei "ACM" devices using protocol = vendor
  USB: serial: fix null-pointer dereferences on disconnect
  USB: option: add Yota / Megafon M100-1 4g modem
  drivers/usb: add missing GENERIC_HARDIRQS dependencies
  USB: storage: properly handle the endian issues of idProduct
  testusb: remove all mentions of 'usbfs'
  usb: gadget: imx_udc: make it depend on BROKEN
  usb: omap_control_usb: fix compile warning
  ARM: OMAP: USB: Add phy binding information
  ARM: OMAP2: MUSB: Specify omap4 has mailbox
  ARM: OMAP: devices: create device for usb part of control module
  ...

137 files changed, 5784 insertions, 2464 deletions

diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index d21349544ce5..3d4d1f8aac5c 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -91,6 +91,7 @@ enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev, s32 mask)
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(dev_pm_qos_flags);
 
 /**
  * __dev_pm_qos_read_value - Get PM QoS constraint for a given device.
diff --git a/drivers/usb/c67x00/c67x00-ll-hpi.c b/drivers/usb/c67x00/c67x00-ll-hpi.c
index a9636f43bca2..3a1ca4dfc83a 100644
--- a/drivers/usb/c67x00/c67x00-ll-hpi.c
+++ b/drivers/usb/c67x00/c67x00-ll-hpi.c
@@ -237,7 +237,7 @@ void c67x00_ll_hpi_disable_sofeop(struct c67x00_sie *sie)
 /* -------------------------------------------------------------------------- */
 /* Transactions */
 
-static inline u16 ll_recv_msg(struct c67x00_device *dev)
+static inline int ll_recv_msg(struct c67x00_device *dev)
 {
         u16 res;
 
diff --git a/drivers/usb/chipidea/ci13xxx_imx.h b/drivers/usb/chipidea/ci13xxx_imx.h
index 2e88accb3d67..9cd2e910b1ca 100644
--- a/drivers/usb/chipidea/ci13xxx_imx.h
+++ b/drivers/usb/chipidea/ci13xxx_imx.h
@@ -19,7 +19,7 @@ struct usbmisc_usb_device {
         struct device *dev; /* usb controller device */
         int index;
 
-        int disable_oc:1; /* over current detect disabled */
+        unsigned int disable_oc:1; /* over current detect disabled */
 };
 
 int usbmisc_set_ops(const struct usbmisc_ops *ops);
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index aebf695a9344..57cae1f897b2 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -411,7 +411,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
         }
 
         base = devm_request_and_ioremap(dev, res);
-        if (!res) {
+        if (!base) {
                 dev_err(dev, "can't request and ioremap resource\n");
                 return -ENOMEM;
         }
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile
index 26059b93dbf4..5e847ad2f58a 100644
--- a/drivers/usb/core/Makefile
+++ b/drivers/usb/core/Makefile
@@ -7,6 +7,7 @@ ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
 usbcore-y := usb.o hub.o hcd.o urb.o message.o driver.o
 usbcore-y += config.o file.o buffer.o sysfs.o endpoint.o
 usbcore-y += devio.o notify.o generic.o quirks.o devices.o
+usbcore-y += port.o
 
 usbcore-$(CONFIG_PCI)           += hcd-pci.o
 usbcore-$(CONFIG_ACPI)          += usb-acpi.o
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index cbacea933b18..e33224e23770 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -316,17 +316,23 @@ static char *usb_dump_iad_descriptor(char *start, char *end,
  */
 static char *usb_dump_config_descriptor(char *start, char *end,
                                 const struct usb_config_descriptor *desc,
-                                int active)
+                                int active, int speed)
 {
+        int mul;
+
         if (start > end)
                 return start;
+        if (speed == USB_SPEED_SUPER)
+                mul = 8;
+        else
+                mul = 2;
         start += sprintf(start, format_config,
                          /* mark active/actual/current cfg. */
                          active ? '*' : ' ',
                          desc->bNumInterfaces,
                          desc->bConfigurationValue,
                          desc->bmAttributes,
-                         desc->bMaxPower * 2);
+                         desc->bMaxPower * mul);
         return start;
 }
 
@@ -342,7 +348,8 @@ static char *usb_dump_config(int speed, char *start, char *end,
         if (!config)
                 /* getting these some in 2.3.7; none in 2.3.6 */
                 return start + sprintf(start, "(null Cfg. desc.)\n");
-        start = usb_dump_config_descriptor(start, end, &config->desc, active);
+        start = usb_dump_config_descriptor(start, end, &config->desc, active,
+                        speed);
         for (i = 0; i < USB_MAXIADS; i++) {
                 if (config->intf_assoc[i] == NULL)
                         break;
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index b78fbe222b72..4a863fdbdccd 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -40,6 +40,7 @@
 #include <linux/signal.h>
 #include <linux/poll.h>
 #include <linux/module.h>
+#include <linux/string.h>
 #include <linux/usb.h>
 #include <linux/usbdevice_fs.h>
 #include <linux/usb/hcd.h>      /* for usbcore internals */
@@ -1077,7 +1078,7 @@ static int proc_getdriver(struct dev_state *ps, void __user *arg)
         if (!intf || !intf->dev.driver)
                 ret = -ENODATA;
         else {
-                strncpy(gd.driver, intf->dev.driver->name,
+                strlcpy(gd.driver, intf->dev.driver->name,
                                 sizeof(gd.driver));
                 ret = (copy_to_user(arg, &gd, sizeof(gd)) ? -EFAULT : 0);
         }
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index eff2010eb63f..271e761f563e 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -100,7 +100,7 @@ int usb_choose_configuration(struct usb_device *udev)
                  */
 
                 /* Rule out configs that draw too much bus current */
-                if (c->desc.bMaxPower * 2 > udev->bus_mA) {
+                if (usb_get_max_power(udev, c) > udev->bus_mA) {
                         insufficient_power++;
                         continue;
                 }
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 8e64adf8e4d5..99b34a30354f 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -620,6 +620,10 @@ nongeneric:
                 status = hcd->driver->hub_control (hcd,
                         typeReq, wValue, wIndex,
                         tbuf, wLength);
+
+                if (typeReq == GetHubDescriptor)
+                        usb_hub_adjust_deviceremovable(hcd->self.root_hub,
+                                (struct usb_hub_descriptor *)tbuf);
                 break;
 error:
                 /* "protocol stall" on error */
@@ -2550,7 +2554,6 @@ int usb_add_hcd(struct usb_hcd *hcd,
         }
 
         /* starting here, usbcore will pay attention to this root hub */
-        rhdev->bus_mA = min(500u, hcd->power_budget);
         if ((retval = register_root_hub(hcd)) != 0)
                 goto err_register_root_hub;
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index cbf7168e3ce7..1775ad471edd 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -26,11 +26,12 @@
 #include <linux/mutex.h>
 #include <linux/freezer.h>
 #include <linux/random.h>
+#include <linux/pm_qos.h>
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
 
-#include "usb.h"
+#include "hub.h"
 
 /* if we are in debug mode, always announce new devices */
 #ifdef DEBUG
@@ -42,62 +43,6 @@
 #define USB_VENDOR_GENESYS_LOGIC                0x05e3
 #define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND        0x01
 
-struct usb_port {
-        struct usb_device *child;
-        struct device dev;
-        struct dev_state *port_owner;
-        enum usb_port_connect_type connect_type;
-};
-
-struct usb_hub {
-        struct device           *intfdev;       /* the "interface" device */
-        struct usb_device       *hdev;
-        struct kref             kref;
-        struct urb              *urb;           /* for interrupt polling pipe */
-
-        /* buffer for urb ... with extra space in case of babble */
-        char                    (*buffer)[8];
-        union {
-                struct usb_hub_status   hub;
-                struct usb_port_status  port;
-        }                       *status;        /* buffer for status reports */
-        struct mutex            status_mutex;   /* for the status buffer */
-
-        int                     error;          /* last reported error */
-        int                     nerrors;        /* track consecutive errors */
-
-        struct list_head        event_list;     /* hubs w/data or errs ready */
-        unsigned long           event_bits[1];  /* status change bitmask */
-        unsigned long           change_bits[1]; /* ports with logical connect
-                                                        status change */
-        unsigned long           busy_bits[1];   /* ports being reset or
-                                                        resumed */
-        unsigned long           removed_bits[1]; /* ports with a "removed"
-                                                        device present */
-        unsigned long           wakeup_bits[1]; /* ports that have signaled
-                                                        remote wakeup */
-#if USB_MAXCHILDREN > 31 /* 8*sizeof(unsigned long) - 1 */
-#error event_bits[] is too short!
-#endif
-
-        struct usb_hub_descriptor *descriptor;  /* class descriptor */
-        struct usb_tt           tt;             /* Transaction Translator */
-
-        unsigned                mA_per_port;    /* current for each child */
-
-        unsigned                limited_power:1;
-        unsigned                quiescing:1;
-        unsigned                disconnected:1;
-
-        unsigned                quirk_check_port_auto_suspend:1;
-
-        unsigned                has_indicators:1;
-        u8                      indicator[USB_MAXCHILDREN];
-        struct delayed_work     leds;
-        struct delayed_work     init_work;
-        struct usb_port         **ports;
-};
-
 static inline int hub_is_superspeed(struct usb_device *hdev)
 {
         return (hdev->descriptor.bDeviceProtocol == USB_HUB_PR_SS);
@@ -164,13 +109,10 @@ MODULE_PARM_DESC(use_both_schemes,
 DECLARE_RWSEM(ehci_cf_port_reset_rwsem);
 EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem);
 
-#define HUB_DEBOUNCE_TIMEOUT    1500
+#define HUB_DEBOUNCE_TIMEOUT    2000
 #define HUB_DEBOUNCE_STEP         25
 #define HUB_DEBOUNCE_STABLE      100
 
-#define to_usb_port(_dev) \
-        container_of(_dev, struct usb_port, dev)
-
 static int usb_reset_and_verify_device(struct usb_device *udev);
 
 static inline char *portspeed(struct usb_hub *hub, int portstatus)
@@ -186,7 +128,7 @@ static inline char *portspeed(struct usb_hub *hub, int portstatus)
 }
 
 /* Note that hdev or one of its children must be locked! */
-static struct usb_hub *hdev_to_hub(struct usb_device *hdev)
+struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev)
 {
         if (!hdev || !hdev->actconfig || !hdev->maxchild)
                 return NULL;
@@ -360,7 +302,7 @@ static void usb_set_lpm_parameters(struct usb_device *udev)
         if (!udev->lpm_capable || udev->speed != USB_SPEED_SUPER)
                 return;
 
-        hub = hdev_to_hub(udev->parent);
+        hub = usb_hub_to_struct_hub(udev->parent);
         /* It doesn't take time to transition the roothub into U0, since it
          * doesn't have an upstream link.
          */
@@ -452,7 +394,7 @@ static int clear_hub_feature(struct usb_device *hdev, int feature)
 /*
  * USB 2.0 spec Section 11.24.2.2
  */
-static int clear_port_feature(struct usb_device *hdev, int port1, int feature)
+int usb_clear_port_feature(struct usb_device *hdev, int port1, int feature)
 {
         return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
                 USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature, port1,
@@ -645,7 +587,7 @@ static void kick_khubd(struct usb_hub *hub)
 
 void usb_kick_khubd(struct usb_device *hdev)
 {
-        struct usb_hub *hub = hdev_to_hub(hdev);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
 
         if (hub)
                 kick_khubd(hub);
@@ -667,7 +609,7 @@ void usb_wakeup_notification(struct usb_device *hdev,
         if (!hdev)
                 return;
 
-        hub = hdev_to_hub(hdev);
+        hub = usb_hub_to_struct_hub(hdev);
         if (hub) {
                 set_bit(portnum, hub->wakeup_bits);
                 kick_khubd(hub);
@@ -774,6 +716,32 @@ static void hub_tt_work(struct work_struct *work)
 }
 
 /**
+ * usb_hub_set_port_power - control hub port's power state
+ * @hdev: target hub
+ * @port1: port index
+ * @set: expected status
+ *
+ * call this function to control port's power via setting or
+ * clearing the port's PORT_POWER feature.
+ */
+int usb_hub_set_port_power(struct usb_device *hdev, int port1,
+                bool set)
+{
+        int ret;
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
+        struct usb_port *port_dev = hub->ports[port1 - 1];
+
+        if (set)
+                ret = set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
+        else
+                ret = usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
+
+        if (!ret)
+                port_dev->power_is_on = set;
+        return ret;
+}
+
+/**
  * usb_hub_clear_tt_buffer - clear control/bulk TT state in high speed hub
  * @urb: an URB associated with the failed or incomplete split transaction
  *
@@ -849,7 +817,11 @@ static unsigned hub_power_on(struct usb_hub *hub, bool do_delay)
                 dev_dbg(hub->intfdev, "trying to enable port power on "
                                 "non-switchable hub\n");
         for (port1 = 1; port1 <= hub->descriptor->bNbrPorts; port1++)
-                set_port_feature(hub->hdev, port1, USB_PORT_FEAT_POWER);
+                if (hub->ports[port1 - 1]->power_is_on)
+                        set_port_feature(hub->hdev, port1, USB_PORT_FEAT_POWER);
+                else
+                        usb_clear_port_feature(hub->hdev, port1,
+                                                USB_PORT_FEAT_POWER);
 
         /* Wait at least 100 msec for power to become stable */
         delay = max(pgood_delay, (unsigned) 100);
@@ -943,7 +915,7 @@ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
                 if (hub_is_superspeed(hub->hdev))
                         ret = hub_usb3_port_disable(hub, port1);
                 else
-                        ret = clear_port_feature(hdev, port1,
+                        ret = usb_clear_port_feature(hdev, port1,
                                         USB_PORT_FEAT_ENABLE);
         }
         if (ret)
@@ -992,7 +964,7 @@ int usb_remove_device(struct usb_device *udev)
 
         if (!udev->parent)      /* Can't remove a root hub */
                 return -EINVAL;
-        hub = hdev_to_hub(udev->parent);
+        hub = usb_hub_to_struct_hub(udev->parent);
         intf = to_usb_interface(hub->intfdev);
 
         usb_autopm_get_interface(intf);
@@ -1124,7 +1096,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                          * Do not disable USB3 protocol ports.
                          */
                         if (!hub_is_superspeed(hdev)) {
-                                clear_port_feature(hdev, port1,
+                                usb_clear_port_feature(hdev, port1,
                                                    USB_PORT_FEAT_ENABLE);
                                 portstatus &= ~USB_PORT_STAT_ENABLE;
                         } else {
@@ -1136,18 +1108,18 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                 /* Clear status-change flags; we'll debounce later */
                 if (portchange & USB_PORT_STAT_C_CONNECTION) {
                         need_debounce_delay = true;
-                        clear_port_feature(hub->hdev, port1,
+                        usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_CONNECTION);
                 }
                 if (portchange & USB_PORT_STAT_C_ENABLE) {
                         need_debounce_delay = true;
-                        clear_port_feature(hub->hdev, port1,
+                        usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_ENABLE);
                 }
                 if ((portchange & USB_PORT_STAT_C_BH_RESET) &&
                                 hub_is_superspeed(hub->hdev)) {
                         need_debounce_delay = true;
-                        clear_port_feature(hub->hdev, port1,
+                        usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_BH_PORT_RESET);
                 }
                 /* We can forget about a "removed" device when there's a
@@ -1181,10 +1153,16 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                                 set_bit(port1, hub->change_bits);
 
                 } else if (udev->persist_enabled) {
+                        struct usb_port *port_dev = hub->ports[port1 - 1];
+
 #ifdef CONFIG_PM
                         udev->reset_resume = 1;
 #endif
-                        set_bit(port1, hub->change_bits);
+                        /* Don't set the change_bits when the device
+                         * was powered off.
+                         */
+                        if (port_dev->power_is_on)
+                                set_bit(port1, hub->change_bits);
 
                 } else {
                         /* The power session is gone; tell khubd */
@@ -1294,52 +1272,6 @@ static int hub_post_reset(struct usb_interface *intf)
         return 0;
 }
 
-static void usb_port_device_release(struct device *dev)
-{
-        struct usb_port *port_dev = to_usb_port(dev);
-
-        kfree(port_dev);
-}
-
-static void usb_hub_remove_port_device(struct usb_hub *hub,
-                                       int port1)
-{
-        device_unregister(&hub->ports[port1 - 1]->dev);
-}
-
-struct device_type usb_port_device_type = {
-        .name =         "usb_port",
-        .release =      usb_port_device_release,
-};
-
-static int usb_hub_create_port_device(struct usb_hub *hub,
-                                      int port1)
-{
-        struct usb_port *port_dev = NULL;
-        int retval;
-
-        port_dev = kzalloc(sizeof(*port_dev), GFP_KERNEL);
-        if (!port_dev) {
-                retval = -ENOMEM;
-                goto exit;
-        }
-
-        hub->ports[port1 - 1] = port_dev;
-        port_dev->dev.parent = hub->intfdev;
-        port_dev->dev.type = &usb_port_device_type;
-        dev_set_name(&port_dev->dev, "port%d", port1);
-
-        retval = device_register(&port_dev->dev);
-        if (retval)
-                goto error_register;
-        return 0;
-
-error_register:
-        put_device(&port_dev->dev);
-exit:
-        return retval;
-}
-
 static int hub_configure(struct usb_hub *hub,
         struct usb_endpoint_descriptor *endpoint)
 {
@@ -1351,6 +1283,8 @@ static int hub_configure(struct usb_hub *hub,
         unsigned int pipe;
         int maxp, ret, i;
         char *message = "out of memory";
+        unsigned unit_load;
+        unsigned full_load;
 
         hub->buffer = kmalloc(sizeof(*hub->buffer), GFP_KERNEL);
         if (!hub->buffer) {
@@ -1397,6 +1331,13 @@ static int hub_configure(struct usb_hub *hub,
         }
 
         wHubCharacteristics = le16_to_cpu(hub->descriptor->wHubCharacteristics);
+        if (hub_is_superspeed(hdev)) {
+                unit_load = 150;
+                full_load = 900;
+        } else {
+                unit_load = 100;
+                full_load = 500;
+        }
 
         /* FIXME for USB 3.0, skip for now */
         if ((wHubCharacteristics & HUB_CHAR_COMPOUND) &&
@@ -1516,40 +1457,44 @@ static int hub_configure(struct usb_hub *hub,
                 goto fail;
         }
         le16_to_cpus(&hubstatus);
+        hcd = bus_to_hcd(hdev->bus);
         if (hdev == hdev->bus->root_hub) {
-                if (hdev->bus_mA == 0 || hdev->bus_mA >= 500)
-                        hub->mA_per_port = 500;
+                if (hcd->power_budget > 0)
+                        hdev->bus_mA = hcd->power_budget;
+                else
+                        hdev->bus_mA = full_load * hdev->maxchild;
+                if (hdev->bus_mA >= full_load)
+                        hub->mA_per_port = full_load;
                 else {
                         hub->mA_per_port = hdev->bus_mA;
                         hub->limited_power = 1;
                 }
         } else if ((hubstatus & (1 << USB_DEVICE_SELF_POWERED)) == 0) {
+                int remaining = hdev->bus_mA -
+                        hub->descriptor->bHubContrCurrent;
+
                 dev_dbg(hub_dev, "hub controller current requirement: %dmA\n",
                         hub->descriptor->bHubContrCurrent);
                 hub->limited_power = 1;
-                if (hdev->maxchild > 0) {
-                        int remaining = hdev->bus_mA -
-                                        hub->descriptor->bHubContrCurrent;
 
-                        if (remaining < hdev->maxchild * 100)
-                                dev_warn(hub_dev,
+                if (remaining < hdev->maxchild * unit_load)
+                        dev_warn(hub_dev,
                                         "insufficient power available "
                                         "to use all downstream ports\n");
-                        hub->mA_per_port = 100;         /* 7.2.1.1 */
-                }
+                hub->mA_per_port = unit_load;   /* 7.2.1 */
+
         } else {        /* Self-powered external hub */
                 /* FIXME: What about battery-powered external hubs that
                  * provide less current per port? */
-                hub->mA_per_port = 500;
+                hub->mA_per_port = full_load;
         }
-        if (hub->mA_per_port < 500)
+        if (hub->mA_per_port < full_load)
                 dev_dbg(hub_dev, "%umA bus power budget for each child\n",
                                 hub->mA_per_port);
 
         /* Update the HCD's internal representation of this hub before khubd
          * starts getting port status changes for devices under the hub.
          */
-        hcd = bus_to_hcd(hdev->bus);
         if (hcd->driver->update_hub_device) {
                 ret = hcd->driver->update_hub_device(hcd, hdev,
                                 &hub->tt, GFP_KERNEL);
@@ -1605,6 +1550,8 @@ static int hub_configure(struct usb_hub *hub,
                         dev_err(hub->intfdev,
                                 "couldn't create port%d device.\n", i + 1);
 
+        usb_hub_adjust_deviceremovable(hdev, hub->descriptor);
+
         hub_activate(hub, HUB_INIT);
         return 0;
 
@@ -1659,6 +1606,7 @@ static void hub_disconnect(struct usb_interface *intf)
         kfree(hub->status);
         kfree(hub->buffer);
 
+        pm_suspend_ignore_children(&intf->dev, false);
         kref_put(&hub->kref, hub_release);
 }
 
@@ -1761,6 +1709,7 @@ descriptor_error:
 
         usb_set_intfdata (intf, hub);
         intf->needs_remote_wakeup = 1;
+        pm_suspend_ignore_children(&intf->dev, true);
 
         if (hdev->speed == USB_SPEED_HIGH)
                 highspeed_hubs++;
@@ -1779,7 +1728,7 @@ static int
 hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data)
 {
         struct usb_device *hdev = interface_to_usbdev (intf);
-        struct usb_hub *hub = hdev_to_hub(hdev);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
 
         /* assert ifno == 0 (part of hub spec) */
         switch (code) {
@@ -1825,7 +1774,7 @@ static int find_port_owner(struct usb_device *hdev, unsigned port1,
         /* This assumes that devices not managed by the hub driver
          * will always have maxchild equal to 0.
          */
-        *ppowner = &(hdev_to_hub(hdev)->ports[port1 - 1]->port_owner);
+        *ppowner = &(usb_hub_to_struct_hub(hdev)->ports[port1 - 1]->port_owner);
         return 0;
 }
 
@@ -1862,7 +1811,7 @@ int usb_hub_release_port(struct usb_device *hdev, unsigned port1,
 
 void usb_hub_release_all_ports(struct usb_device *hdev, struct dev_state *owner)
 {
-        struct usb_hub *hub = hdev_to_hub(hdev);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
         int n;
 
         for (n = 0; n < hdev->maxchild; n++) {
@@ -1879,13 +1828,13 @@ bool usb_device_is_owned(struct usb_device *udev)
 
         if (udev->state == USB_STATE_NOTATTACHED || !udev->parent)
                 return false;
-        hub = hdev_to_hub(udev->parent);
+        hub = usb_hub_to_struct_hub(udev->parent);
         return !!hub->ports[udev->portnum - 1]->port_owner;
 }
 
 static void recursively_mark_NOTATTACHED(struct usb_device *udev)
 {
-        struct usb_hub *hub = hdev_to_hub(udev);
+        struct usb_hub *hub = usb_hub_to_struct_hub(udev);
         int i;
 
         for (i = 0; i < udev->maxchild; ++i) {
@@ -2054,7 +2003,7 @@ static void hub_free_dev(struct usb_device *udev)
 void usb_disconnect(struct usb_device **pdev)
 {
         struct usb_device       *udev = *pdev;
-        struct usb_hub          *hub = hdev_to_hub(udev);
+        struct usb_hub          *hub = usb_hub_to_struct_hub(udev);
         int                     i;
 
         /* mark the device as inactive, so any further urb submissions for
@@ -2081,6 +2030,19 @@ void usb_disconnect(struct usb_device **pdev)
         usb_disable_device(udev, 0);
         usb_hcd_synchronize_unlinks(udev);
 
+        if (udev->parent) {
+                struct usb_hub *hub = usb_hub_to_struct_hub(udev->parent);
+                struct usb_port *port_dev = hub->ports[udev->portnum - 1];
+
+                sysfs_remove_link(&udev->dev.kobj, "port");
+                sysfs_remove_link(&port_dev->dev.kobj, "device");
+
+                if (!port_dev->did_runtime_put)
+                        pm_runtime_put(&port_dev->dev);
+                else
+                        port_dev->did_runtime_put = false;
+        }
+
         usb_remove_ep_devs(&udev->ep0);
         usb_unlock_device(udev);
 
@@ -2267,7 +2229,7 @@ static void set_usb_port_removable(struct usb_device *udev)
         if (!hdev)
                 return;
 
-        hub = hdev_to_hub(udev->parent);
+        hub = usb_hub_to_struct_hub(udev->parent);
 
         wHubCharacteristics = le16_to_cpu(hub->descriptor->wHubCharacteristics);
 
@@ -2373,6 +2335,26 @@ int usb_new_device(struct usb_device *udev)
                 goto fail;
         }
 
+        /* Create link files between child device and usb port device. */
+        if (udev->parent) {
+                struct usb_hub *hub = usb_hub_to_struct_hub(udev->parent);
+                struct usb_port *port_dev = hub->ports[udev->portnum - 1];
+
+                err = sysfs_create_link(&udev->dev.kobj,
+                                &port_dev->dev.kobj, "port");
+                if (err)
+                        goto fail;
+
+                err = sysfs_create_link(&port_dev->dev.kobj,
+                                &udev->dev.kobj, "device");
+                if (err) {
+                        sysfs_remove_link(&udev->dev.kobj, "port");
+                        goto fail;
+                }
+
+                pm_runtime_get_sync(&port_dev->dev);
+        }
+
         (void) usb_create_ep_devs(&udev->dev, &udev->ep0, udev);
         usb_mark_last_busy(udev);
         pm_runtime_put_sync_autosuspend(&udev->dev);
@@ -2535,77 +2517,9 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
                         return ret;
 
                 /* The port state is unknown until the reset completes. */
-                if ((portstatus & USB_PORT_STAT_RESET))
-                        goto delay;
-
-                /*
-                 * Some buggy devices require a warm reset to be issued even
-                 * when the port appears not to be connected.
-                 */
-                if (!warm) {
-                        /*
-                         * Some buggy devices can cause an NEC host controller
-                         * to transition to the "Error" state after a hot port
-                         * reset.  This will show up as the port state in
-                         * "Inactive", and the port may also report a
-                         * disconnect.  Forcing a warm port reset seems to make
-                         * the device work.
-                         *
-                         * See https://bugzilla.kernel.org/show_bug.cgi?id=41752
-                         */
-                        if (hub_port_warm_reset_required(hub, portstatus)) {
-                                int ret;
-
-                                if ((portchange & USB_PORT_STAT_C_CONNECTION))
-                                        clear_port_feature(hub->hdev, port1,
-                                                        USB_PORT_FEAT_C_CONNECTION);
-                                if (portchange & USB_PORT_STAT_C_LINK_STATE)
-                                        clear_port_feature(hub->hdev, port1,
-                                                        USB_PORT_FEAT_C_PORT_LINK_STATE);
-                                if (portchange & USB_PORT_STAT_C_RESET)
-                                        clear_port_feature(hub->hdev, port1,
-                                                        USB_PORT_FEAT_C_RESET);
-                                dev_dbg(hub->intfdev, "hot reset failed, warm reset port %d\n",
-                                                port1);
-                                ret = hub_port_reset(hub, port1,
-                                                udev, HUB_BH_RESET_TIME,
-                                                true);
-                                if ((portchange & USB_PORT_STAT_C_CONNECTION))
-                                        clear_port_feature(hub->hdev, port1,
-                                                        USB_PORT_FEAT_C_CONNECTION);
-                                return ret;
-                        }
-                        /* Device went away? */
-                        if (!(portstatus & USB_PORT_STAT_CONNECTION))
-                                return -ENOTCONN;
-
-                        /* bomb out completely if the connection bounced */
-                        if ((portchange & USB_PORT_STAT_C_CONNECTION))
-                                return -ENOTCONN;
-
-                        if ((portstatus & USB_PORT_STAT_ENABLE)) {
-                                if (hub_is_wusb(hub))
-                                        udev->speed = USB_SPEED_WIRELESS;
-                                else if (hub_is_superspeed(hub->hdev))
-                                        udev->speed = USB_SPEED_SUPER;
-                                else if (portstatus & USB_PORT_STAT_HIGH_SPEED)
-                                        udev->speed = USB_SPEED_HIGH;
-                                else if (portstatus & USB_PORT_STAT_LOW_SPEED)
-                                        udev->speed = USB_SPEED_LOW;
-                                else
-                                        udev->speed = USB_SPEED_FULL;
-                                return 0;
-                        }
-                } else {
-                        if (!(portstatus & USB_PORT_STAT_CONNECTION) ||
-                                        hub_port_warm_reset_required(hub,
-                                                portstatus))
-                                return -ENOTCONN;
-
-                        return 0;
-                }
+                if (!(portstatus & USB_PORT_STAT_RESET))
+                        break;
 
-delay:
                 /* switch to the long delay after two short delay failures */
                 if (delay_time >= 2 * HUB_SHORT_RESET_TIME)
                         delay = HUB_LONG_RESET_TIME;
@@ -2615,20 +2529,54 @@ delay:
                         port1, warm ? "warm " : "", delay);
         }
 
-        return -EBUSY;
+        if ((portstatus & USB_PORT_STAT_RESET))
+                return -EBUSY;
+
+        if (hub_port_warm_reset_required(hub, portstatus))
+                return -ENOTCONN;
+
+        /* Device went away? */
+        if (!(portstatus & USB_PORT_STAT_CONNECTION))
+                return -ENOTCONN;
+
+        /* bomb out completely if the connection bounced.  A USB 3.0
+         * connection may bounce if multiple warm resets were issued,
+         * but the device may have successfully re-connected. Ignore it.
+         */
+        if (!hub_is_superspeed(hub->hdev) &&
+                        (portchange & USB_PORT_STAT_C_CONNECTION))
+                return -ENOTCONN;
+
+        if (!(portstatus & USB_PORT_STAT_ENABLE))
+                return -EBUSY;
+
+        if (!udev)
+                return 0;
+
+        if (hub_is_wusb(hub))
+                udev->speed = USB_SPEED_WIRELESS;
+        else if (hub_is_superspeed(hub->hdev))
+                udev->speed = USB_SPEED_SUPER;
+        else if (portstatus & USB_PORT_STAT_HIGH_SPEED)
+                udev->speed = USB_SPEED_HIGH;
+        else if (portstatus & USB_PORT_STAT_LOW_SPEED)
+                udev->speed = USB_SPEED_LOW;
+        else
+                udev->speed = USB_SPEED_FULL;
+        return 0;
 }
 
 static void hub_port_finish_reset(struct usb_hub *hub, int port1,
-                        struct usb_device *udev, int *status, bool warm)
+                        struct usb_device *udev, int *status)
 {
         switch (*status) {
         case 0:
-                if (!warm) {
-                        struct usb_hcd *hcd;
-                        /* TRSTRCY = 10 ms; plus some extra */
-                        msleep(10 + 40);
+                /* TRSTRCY = 10 ms; plus some extra */
+                msleep(10 + 40);
+                if (udev) {
+                        struct usb_hcd *hcd = bus_to_hcd(udev->bus);
+
                         update_devnum(udev, 0);
-                        hcd = bus_to_hcd(udev->bus);
                         /* The xHC may think the device is already reset,
                          * so ignore the status.
                          */
@@ -2638,16 +2586,17 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
                 /* FALL THROUGH */
         case -ENOTCONN:
         case -ENODEV:
-                clear_port_feature(hub->hdev,
+                usb_clear_port_feature(hub->hdev,
                                 port1, USB_PORT_FEAT_C_RESET);
-                /* FIXME need disconnect() for NOTATTACHED device */
                 if (hub_is_superspeed(hub->hdev)) {
-                        clear_port_feature(hub->hdev, port1,
+                        usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_BH_PORT_RESET);
-                        clear_port_feature(hub->hdev, port1,
+                        usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_PORT_LINK_STATE);
+                        usb_clear_port_feature(hub->hdev, port1,
+                                        USB_PORT_FEAT_C_CONNECTION);
                 }
-                if (!warm)
+                if (udev)
                         usb_set_device_state(udev, *status
                                         ? USB_STATE_NOTATTACHED
                                         : USB_STATE_DEFAULT);
@@ -2660,18 +2609,30 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
                         struct usb_device *udev, unsigned int delay, bool warm)
 {
         int i, status;
+        u16 portchange, portstatus;
 
-        if (!warm) {
-                /* Block EHCI CF initialization during the port reset.
-                 * Some companion controllers don't like it when they mix.
-                 */
-                down_read(&ehci_cf_port_reset_rwsem);
-        } else {
-                if (!hub_is_superspeed(hub->hdev)) {
+        if (!hub_is_superspeed(hub->hdev)) {
+                if (warm) {
                         dev_err(hub->intfdev, "only USB3 hub support "
                                                 "warm reset\n");
                         return -EINVAL;
                 }
+                /* Block EHCI CF initialization during the port reset.
+                 * Some companion controllers don't like it when they mix.
+                 */
+                down_read(&ehci_cf_port_reset_rwsem);
+        } else if (!warm) {
+                /*
+                 * If the caller hasn't explicitly requested a warm reset,
+                 * double check and see if one is needed.
+                 */
+                status = hub_port_status(hub, port1,
+                                        &portstatus, &portchange);
+                if (status < 0)
+                        goto done;
+
+                if (hub_port_warm_reset_required(hub, portstatus))
+                        warm = true;
         }
 
         /* Reset the port */
@@ -2692,10 +2653,33 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
                                                 status);
                 }
 
-                /* return on disconnect or reset */
+                /* Check for disconnect or reset */
                 if (status == 0 || status == -ENOTCONN || status == -ENODEV) {
-                        hub_port_finish_reset(hub, port1, udev, &status, warm);
-                        goto done;
+                        hub_port_finish_reset(hub, port1, udev, &status);
+
+                        if (!hub_is_superspeed(hub->hdev))
+                                goto done;
+
+                        /*
+                         * If a USB 3.0 device migrates from reset to an error
+                         * state, re-issue the warm reset.
+                         */
+                        if (hub_port_status(hub, port1,
+                                        &portstatus, &portchange) < 0)
+                                goto done;
+
+                        if (!hub_port_warm_reset_required(hub, portstatus))
+                                goto done;
+
+                        /*
+                         * If the port is in SS.Inactive or Compliance Mode, the
+                         * hot or warm reset failed.  Try another warm reset.
+                         */
+                        if (!warm) {
+                                dev_dbg(hub->intfdev, "hot reset failed, warm reset port %d\n",
+                                                port1);
+                                warm = true;
+                        }
                 }
 
                 dev_dbg (hub->intfdev,
@@ -2709,7 +2693,7 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
                 port1);
 
 done:
-        if (!warm)
+        if (!hub_is_superspeed(hub->hdev))
                 up_read(&ehci_cf_port_reset_rwsem);
 
         return status;
@@ -2783,10 +2767,10 @@ static int check_port_resume_type(struct usb_device *udev,
 
                 /* Late port handoff can set status-change bits */
                 if (portchange & USB_PORT_STAT_C_CONNECTION)
-                        clear_port_feature(hub->hdev, port1,
+                        usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_CONNECTION);
                 if (portchange & USB_PORT_STAT_C_ENABLE)
-                        clear_port_feature(hub->hdev, port1,
+                        usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_ENABLE);
         }
 
@@ -2904,7 +2888,9 @@ static int usb_disable_function_remotewakeup(struct usb_device *udev)
  */
 int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
 {
-        struct usb_hub  *hub = hdev_to_hub(udev->parent);
+        struct usb_hub  *hub = usb_hub_to_struct_hub(udev->parent);
+        struct usb_port *port_dev = hub->ports[udev->portnum - 1];
+        enum pm_qos_flags_status pm_qos_stat;
         int             port1 = udev->portnum;
         int             status;
 
@@ -2962,9 +2948,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
 
         /* see 7.1.7.6 */
         if (hub_is_superspeed(hub->hdev))
-                status = set_port_feature(hub->hdev,
-                                port1 | (USB_SS_PORT_LS_U3 << 3),
-                                USB_PORT_FEAT_LINK_STATE);
+                status = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_U3);
         else
                 status = set_port_feature(hub->hdev, port1,
                                                 USB_PORT_FEAT_SUSPEND);
@@ -3006,6 +2990,21 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
                 udev->port_is_suspended = 1;
                 msleep(10);
         }
+
+        /*
+         * Check whether current status meets the requirement of
+         * usb port power off mechanism
+         */
+        pm_qos_stat = dev_pm_qos_flags(&port_dev->dev,
+                        PM_QOS_FLAG_NO_POWER_OFF);
+        if (!udev->do_remote_wakeup
+                        && pm_qos_stat != PM_QOS_FLAGS_ALL
+                        && udev->persist_enabled
+                        && !status) {
+                pm_runtime_put_sync(&port_dev->dev);
+                port_dev->did_runtime_put = true;
+        }
+
         usb_mark_last_busy(hub->hdev);
         return status;
 }
@@ -3141,11 +3140,22 @@ static int finish_port_resume(struct usb_device *udev)
  */
 int usb_port_resume(struct usb_device *udev, pm_message_t msg)
 {
-        struct usb_hub  *hub = hdev_to_hub(udev->parent);
+        struct usb_hub  *hub = usb_hub_to_struct_hub(udev->parent);
+        struct usb_port *port_dev = hub->ports[udev->portnum  - 1];
         int             port1 = udev->portnum;
         int             status;
         u16             portchange, portstatus;
 
+        if (port_dev->did_runtime_put) {
+                status = pm_runtime_get_sync(&port_dev->dev);
+                port_dev->did_runtime_put = false;
+                if (status < 0) {
+                        dev_dbg(&udev->dev, "can't resume usb port, status %d\n",
+                                        status);
+                        return status;
+                }
+        }
+
         /* Skip the initial Clear-Suspend step for a remote wakeup */
         status = hub_port_status(hub, port1, &portstatus, &portchange);
         if (status == 0 && !port_is_suspended(hub, portstatus))
@@ -3157,11 +3167,9 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
 
         /* see 7.1.7.7; affects power usage, but not budgeting */
         if (hub_is_superspeed(hub->hdev))
-                status = set_port_feature(hub->hdev,
-                                port1 | (USB_SS_PORT_LS_U0 << 3),
-                                USB_PORT_FEAT_LINK_STATE);
+                status = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_U0);
         else
-                status = clear_port_feature(hub->hdev,
+                status = usb_clear_port_feature(hub->hdev,
                                 port1, USB_PORT_FEAT_SUSPEND);
         if (status) {
                 dev_dbg(hub->intfdev, "can't resume port %d, status %d\n",
@@ -3187,11 +3195,11 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
                 udev->port_is_suspended = 0;
                 if (hub_is_superspeed(hub->hdev)) {
                         if (portchange & USB_PORT_STAT_C_LINK_STATE)
-                                clear_port_feature(hub->hdev, port1,
+                                usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_PORT_LINK_STATE);
                 } else {
                         if (portchange & USB_PORT_STAT_C_SUSPEND)
-                                clear_port_feature(hub->hdev, port1,
+                                usb_clear_port_feature(hub->hdev, port1,
                                                 USB_PORT_FEAT_C_SUSPEND);
                 }
         }
@@ -3247,7 +3255,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
 
 int usb_port_resume(struct usb_device *udev, pm_message_t msg)
 {
-        struct usb_hub  *hub = hdev_to_hub(udev->parent);
+        struct usb_hub  *hub = usb_hub_to_struct_hub(udev->parent);
         int             port1 = udev->portnum;
         int             status;
         u16             portchange, portstatus;
@@ -3826,7 +3834,7 @@ EXPORT_SYMBOL_GPL(usb_enable_ltm);
  * every 25ms for transient disconnects.  When the port status has been
  * unchanged for 100ms it returns the port status.
  */
-static int hub_port_debounce(struct usb_hub *hub, int port1)
+int hub_port_debounce(struct usb_hub *hub, int port1, bool must_be_connected)
 {
         int ret;
         int total_time, stable_time = 0;
@@ -3840,7 +3848,9 @@ static int hub_port_debounce(struct usb_hub *hub, int port1)
 
                 if (!(portchange & USB_PORT_STAT_C_CONNECTION) &&
                      (portstatus & USB_PORT_STAT_CONNECTION) == connection) {
-                        stable_time += HUB_DEBOUNCE_STEP;
+                        if (!must_be_connected ||
+                             (connection == USB_PORT_STAT_CONNECTION))
+                                stable_time += HUB_DEBOUNCE_STEP;
                         if (stable_time >= HUB_DEBOUNCE_STABLE)
                                 break;
                 } else {
@@ -3849,7 +3859,7 @@ static int hub_port_debounce(struct usb_hub *hub, int port1)
                 }
 
                 if (portchange & USB_PORT_STAT_C_CONNECTION) {
-                        clear_port_feature(hub->hdev, port1,
+                        usb_clear_port_feature(hub->hdev, port1,
                                         USB_PORT_FEAT_C_CONNECTION);
                 }
 
@@ -4246,16 +4256,23 @@ hub_power_remaining (struct usb_hub *hub)
         for (port1 = 1; port1 <= hdev->maxchild; ++port1) {
                 struct usb_device       *udev = hub->ports[port1 - 1]->child;
                 int                     delta;
+                unsigned                unit_load;
 
                 if (!udev)
                         continue;
+                if (hub_is_superspeed(udev))
+                        unit_load = 150;
+                else
+                        unit_load = 100;
 
-                /* Unconfigured devices may not use more than 100mA,
-                 * or 8mA for OTG ports */
+                /*
+                 * Unconfigured devices may not use more than one unit load,
+                 * or 8mA for OTG ports
+                 */
                 if (udev->actconfig)
-                        delta = udev->actconfig->desc.bMaxPower * 2;
+                        delta = usb_get_max_power(udev, udev->actconfig);
                 else if (port1 != udev->bus->otg_port || hdev->parent)
-                        delta = 100;
+                        delta = unit_load;
                 else
                         delta = 8;
                 if (delta > hub->mA_per_port)
@@ -4290,6 +4307,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
                         le16_to_cpu(hub->descriptor->wHubCharacteristics);
         struct usb_device *udev;
         int status, i;
+        unsigned unit_load;
 
         dev_dbg (hub_dev,
                 "port %d, status %04x, change %04x, %s\n",
@@ -4353,7 +4371,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
 
         if (portchange & (USB_PORT_STAT_C_CONNECTION |
                                 USB_PORT_STAT_C_ENABLE)) {
-                status = hub_port_debounce(hub, port1);
+                status = hub_port_debounce_be_stable(hub, port1);
                 if (status < 0) {
                         if (printk_ratelimit())
                                 dev_err(hub_dev, "connect-debounce failed, "
@@ -4379,6 +4397,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
                         goto done;
                 return;
         }
+        if (hub_is_superspeed(hub->hdev))
+                unit_load = 150;
+        else
+                unit_load = 100;
 
         for (i = 0; i < SET_CONFIG_TRIES; i++) {
 
@@ -4426,7 +4448,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
                  * on the parent.
                  */
                 if (udev->descriptor.bDeviceClass == USB_CLASS_HUB
-                                && udev->bus_mA <= 100) {
+                                && udev->bus_mA <= unit_load) {
                         u16     devstat;
 
                         status = usb_get_status(udev, USB_RECIP_DEVICE, 0,
@@ -4528,7 +4550,7 @@ static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
         if (!hub_is_superspeed(hdev)) {
                 if (!(portchange & USB_PORT_STAT_C_SUSPEND))
                         return 0;
-                clear_port_feature(hdev, port, USB_PORT_FEAT_C_SUSPEND);
+                usb_clear_port_feature(hdev, port, USB_PORT_FEAT_C_SUSPEND);
         } else {
                 if (!udev || udev->state != USB_STATE_SUSPENDED ||
                                  (portstatus & USB_PORT_STAT_LINK_STATE) !=
@@ -4656,7 +4678,7 @@ static void hub_events(void)
                                 continue;
 
                         if (portchange & USB_PORT_STAT_C_CONNECTION) {
-                                clear_port_feature(hdev, i,
+                                usb_clear_port_feature(hdev, i,
                                         USB_PORT_FEAT_C_CONNECTION);
                                 connect_change = 1;
                         }
@@ -4667,7 +4689,7 @@ static void hub_events(void)
                                                 "port %d enable change, "
                                                 "status %08x\n",
                                                 i, portstatus);
-                                clear_port_feature(hdev, i,
+                                usb_clear_port_feature(hdev, i,
                                         USB_PORT_FEAT_C_ENABLE);
 
                                 /*
@@ -4698,7 +4720,7 @@ static void hub_events(void)
 
                                 dev_dbg(hub_dev, "over-current change on port "
                                         "%d\n", i);
-                                clear_port_feature(hdev, i,
+                                usb_clear_port_feature(hdev, i,
                                         USB_PORT_FEAT_C_OVER_CURRENT);
                                 msleep(100);    /* Cool down */
                                 hub_power_on(hub, true);
@@ -4712,7 +4734,7 @@ static void hub_events(void)
                                 dev_dbg (hub_dev,
                                         "reset change on port %d\n",
                                         i);
-                                clear_port_feature(hdev, i,
+                                usb_clear_port_feature(hdev, i,
                                         USB_PORT_FEAT_C_RESET);
                         }
                         if ((portchange & USB_PORT_STAT_C_BH_RESET) &&
@@ -4720,18 +4742,18 @@ static void hub_events(void)
                                 dev_dbg(hub_dev,
                                         "warm reset change on port %d\n",
                                         i);
-                                clear_port_feature(hdev, i,
+                                usb_clear_port_feature(hdev, i,
                                         USB_PORT_FEAT_C_BH_PORT_RESET);
                         }
                         if (portchange & USB_PORT_STAT_C_LINK_STATE) {
-                                clear_port_feature(hub->hdev, i,
+                                usb_clear_port_feature(hub->hdev, i,
                                                 USB_PORT_FEAT_C_PORT_LINK_STATE);
                         }
                         if (portchange & USB_PORT_STAT_C_CONFIG_ERROR) {
                                 dev_warn(hub_dev,
                                         "config error on port %d\n",
                                         i);
-                                clear_port_feature(hub->hdev, i,
+                                usb_clear_port_feature(hub->hdev, i,
                                                 USB_PORT_FEAT_C_PORT_CONFIG_ERROR);
                         }
 
@@ -4740,12 +4762,21 @@ static void hub_events(void)
                          */
                         if (hub_port_warm_reset_required(hub, portstatus)) {
                                 int status;
+                                struct usb_device *udev =
+                                        hub->ports[i - 1]->child;
 
                                 dev_dbg(hub_dev, "warm reset port %d\n", i);
-                                status = hub_port_reset(hub, i, NULL,
-                                                HUB_BH_RESET_TIME, true);
-                                if (status < 0)
-                                        hub_port_disable(hub, i, 1);
+                                if (!udev) {
+                                        status = hub_port_reset(hub, i,
+                                                        NULL, HUB_BH_RESET_TIME,
+                                                        true);
+                                        if (status < 0)
+                                                hub_port_disable(hub, i, 1);
+                                } else {
+                                        usb_lock_device(udev);
+                                        status = usb_reset_device(udev);
+                                        usb_unlock_device(udev);
+                                }
                                 connect_change = 0;
                         }
 
@@ -5006,7 +5037,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
                 dev_dbg(&udev->dev, "%s for root hub!\n", __func__);
                 return -EISDIR;
         }
-        parent_hub = hdev_to_hub(parent_hdev);
+        parent_hub = usb_hub_to_struct_hub(parent_hdev);
 
         /* Disable LPM and LTM while we reset the device and reinstall the alt
          * settings.  Device-initiated LPM settings, and system exit latency
@@ -5262,7 +5293,7 @@ EXPORT_SYMBOL_GPL(usb_queue_reset_device);
 struct usb_device *usb_hub_find_child(struct usb_device *hdev,
                 int port1)
 {
-        struct usb_hub *hub = hdev_to_hub(hdev);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
 
         if (port1 < 1 || port1 > hdev->maxchild)
                 return NULL;
@@ -5279,7 +5310,7 @@ EXPORT_SYMBOL_GPL(usb_hub_find_child);
 void usb_set_hub_port_connect_type(struct usb_device *hdev, int port1,
         enum usb_port_connect_type type)
 {
-        struct usb_hub *hub = hdev_to_hub(hdev);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
 
         hub->ports[port1 - 1]->connect_type = type;
 }
@@ -5295,11 +5326,52 @@ void usb_set_hub_port_connect_type(struct usb_device *hdev, int port1,
 enum usb_port_connect_type
 usb_get_hub_port_connect_type(struct usb_device *hdev, int port1)
 {
-        struct usb_hub *hub = hdev_to_hub(hdev);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
 
         return hub->ports[port1 - 1]->connect_type;
 }
 
+void usb_hub_adjust_deviceremovable(struct usb_device *hdev,
+                struct usb_hub_descriptor *desc)
+{
+        enum usb_port_connect_type connect_type;
+        int i;
+
+        if (!hub_is_superspeed(hdev)) {
+                for (i = 1; i <= hdev->maxchild; i++) {
+                        connect_type = usb_get_hub_port_connect_type(hdev, i);
+
+                        if (connect_type == USB_PORT_CONNECT_TYPE_HARD_WIRED) {
+                                u8 mask = 1 << (i%8);
+
+                                if (!(desc->u.hs.DeviceRemovable[i/8] & mask)) {
+                                        dev_dbg(&hdev->dev, "usb port%d's DeviceRemovable is changed to 1 according to platform information.\n",
+                                                i);
+                                        desc->u.hs.DeviceRemovable[i/8] |= mask;
+                                }
+                        }
+                }
+        } else {
+                u16 port_removable = le16_to_cpu(desc->u.ss.DeviceRemovable);
+
+                for (i = 1; i <= hdev->maxchild; i++) {
+                        connect_type = usb_get_hub_port_connect_type(hdev, i);
+
+                        if (connect_type == USB_PORT_CONNECT_TYPE_HARD_WIRED) {
+                                u16 mask = 1 << i;
+
+                                if (!(port_removable & mask)) {
+                                        dev_dbg(&hdev->dev, "usb port%d's DeviceRemovable is changed to 1 according to platform information.\n",
+                                                i);
+                                        port_removable |= mask;
+                                }
+                        }
+                }
+
+                desc->u.ss.DeviceRemovable = cpu_to_le16(port_removable);
+        }
+}
+
 #ifdef CONFIG_ACPI
 /**
  * usb_get_hub_port_acpi_handle - Get the usb port's acpi handle
@@ -5312,7 +5384,7 @@ usb_get_hub_port_connect_type(struct usb_device *hdev, int port1)
 acpi_handle usb_get_hub_port_acpi_handle(struct usb_device *hdev,
         int port1)
 {
-        struct usb_hub *hub = hdev_to_hub(hdev);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
 
         return DEVICE_ACPI_HANDLE(&hub->ports[port1 - 1]->dev);
 }
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
new file mode 100644
index 000000000000..80ab9ee07017
--- /dev/null
+++ b/drivers/usb/core/hub.h
@@ -0,0 +1,122 @@
+/*
+ * usb hub driver head file
+ *
+ * Copyright (C) 1999 Linus Torvalds
+ * Copyright (C) 1999 Johannes Erdfelt
+ * Copyright (C) 1999 Gregory P. Smith
+ * Copyright (C) 2001 Brad Hards (bhards@bigpond.net.au)
+ * Copyright (C) 2012 Intel Corp (tianyu.lan@intel.com)
+ *
+ *  move struct usb_hub to this file.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include <linux/usb.h>
+#include <linux/usb/ch11.h>
+#include <linux/usb/hcd.h>
+#include "usb.h"
+
+struct usb_hub {
+        struct device           *intfdev;       /* the "interface" device */
+        struct usb_device       *hdev;
+        struct kref             kref;
+        struct urb              *urb;           /* for interrupt polling pipe */
+
+        /* buffer for urb ... with extra space in case of babble */
+        u8                      (*buffer)[8];
+        union {
+                struct usb_hub_status   hub;
+                struct usb_port_status  port;
+        }                       *status;        /* buffer for status reports */
+        struct mutex            status_mutex;   /* for the status buffer */
+
+        int                     error;          /* last reported error */
+        int                     nerrors;        /* track consecutive errors */
+
+        struct list_head        event_list;     /* hubs w/data or errs ready */
+        unsigned long           event_bits[1];  /* status change bitmask */
+        unsigned long           change_bits[1]; /* ports with logical connect
+                                                        status change */
+        unsigned long           busy_bits[1];   /* ports being reset or
+                                                        resumed */
+        unsigned long           removed_bits[1]; /* ports with a "removed"
+                                                        device present */
+        unsigned long           wakeup_bits[1]; /* ports that have signaled
+                                                        remote wakeup */
+#if USB_MAXCHILDREN > 31 /* 8*sizeof(unsigned long) - 1 */
+#error event_bits[] is too short!
+#endif
+
+        struct usb_hub_descriptor *descriptor;  /* class descriptor */
+        struct usb_tt           tt;             /* Transaction Translator */
+
+        unsigned                mA_per_port;    /* current for each child */
+
+        unsigned                limited_power:1;
+        unsigned                quiescing:1;
+        unsigned                disconnected:1;
+
+        unsigned                quirk_check_port_auto_suspend:1;
+
+        unsigned                has_indicators:1;
+        u8                      indicator[USB_MAXCHILDREN];
+        struct delayed_work     leds;
+        struct delayed_work     init_work;
+        struct usb_port         **ports;
+};
+
+/**
+ * struct usb port - kernel's representation of a usb port
+ * @child: usb device attatched to the port
+ * @dev: generic device interface
+ * @port_owner: port's owner
+ * @connect_type: port's connect type
+ * @portnum: port index num based one
+ * @power_is_on: port's power state
+ * @did_runtime_put: port has done pm_runtime_put().
+ */
+struct usb_port {
+        struct usb_device *child;
+        struct device dev;
+        struct dev_state *port_owner;
+        enum usb_port_connect_type connect_type;
+        u8 portnum;
+        unsigned power_is_on:1;
+        unsigned did_runtime_put:1;
+};
+
+#define to_usb_port(_dev) \
+        container_of(_dev, struct usb_port, dev)
+
+extern int usb_hub_create_port_device(struct usb_hub *hub,
+                int port1);
+extern void usb_hub_remove_port_device(struct usb_hub *hub,
+                int port1);
+extern int usb_hub_set_port_power(struct usb_device *hdev,
+                int port1, bool set);
+extern struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev);
+extern int hub_port_debounce(struct usb_hub *hub, int port1,
+                bool must_be_connected);
+extern int usb_clear_port_feature(struct usb_device *hdev,
+                int port1, int feature);
+
+static inline int hub_port_debounce_be_connected(struct usb_hub *hub,
+                int port1)
+{
+        return hub_port_debounce(hub, port1, true);
+}
+
+static inline int hub_port_debounce_be_stable(struct usb_hub *hub,
+                int port1)
+{
+        return hub_port_debounce(hub, port1, false);
+}
+
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 131f73649b60..444d30e3a78b 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1751,7 +1751,7 @@ free_interfaces:
                         }
                 }
 
-                i = dev->bus_mA - cp->desc.bMaxPower * 2;
+                i = dev->bus_mA - usb_get_max_power(dev, cp);
                 if (i < 0)
                         dev_warn(&dev->dev, "new config #%d exceeds power "
                                         "limit by %dmA\n",
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
new file mode 100644
index 000000000000..797f9d514732
--- /dev/null
+++ b/drivers/usb/core/port.c
@@ -0,0 +1,202 @@
+/*
+ * usb port device code
+ *
+ * Copyright (C) 2012 Intel Corp
+ *
+ * Author: Lan Tianyu <tianyu.lan@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/pm_qos.h>
+
+#include "hub.h"
+
+static const struct attribute_group *port_dev_group[];
+
+static ssize_t show_port_connect_type(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct usb_port *port_dev = to_usb_port(dev);
+        char *result;
+
+        switch (port_dev->connect_type) {
+        case USB_PORT_CONNECT_TYPE_HOT_PLUG:
+                result = "hotplug";
+                break;
+        case USB_PORT_CONNECT_TYPE_HARD_WIRED:
+                result = "hardwired";
+                break;
+        case USB_PORT_NOT_USED:
+                result = "not used";
+                break;
+        default:
+                result = "unknown";
+                break;
+        }
+
+        return sprintf(buf, "%s\n", result);
+}
+static DEVICE_ATTR(connect_type, S_IRUGO, show_port_connect_type,
+                NULL);
+
+static struct attribute *port_dev_attrs[] = {
+        &dev_attr_connect_type.attr,
+        NULL,
+};
+
+static struct attribute_group port_dev_attr_grp = {
+        .attrs = port_dev_attrs,
+};
+
+static const struct attribute_group *port_dev_group[] = {
+        &port_dev_attr_grp,
+        NULL,
+};
+
+static void usb_port_device_release(struct device *dev)
+{
+        struct usb_port *port_dev = to_usb_port(dev);
+
+        dev_pm_qos_hide_flags(dev);
+        kfree(port_dev);
+}
+
+#ifdef CONFIG_USB_SUSPEND
+static int usb_port_runtime_resume(struct device *dev)
+{
+        struct usb_port *port_dev = to_usb_port(dev);
+        struct usb_device *hdev = to_usb_device(dev->parent->parent);
+        struct usb_interface *intf = to_usb_interface(dev->parent);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
+        int port1 = port_dev->portnum;
+        int retval;
+
+        if (!hub)
+                return -EINVAL;
+
+        usb_autopm_get_interface(intf);
+        set_bit(port1, hub->busy_bits);
+
+        retval = usb_hub_set_port_power(hdev, port1, true);
+        if (port_dev->child && !retval) {
+                /*
+                 * Wait for usb hub port to be reconnected in order to make
+                 * the resume procedure successful.
+                 */
+                retval = hub_port_debounce_be_connected(hub, port1);
+                if (retval < 0) {
+                        dev_dbg(&port_dev->dev, "can't get reconnection after setting port  power on, status %d\n",
+                                        retval);
+                        goto out;
+                }
+                usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_ENABLE);
+
+                /* Set return value to 0 if debounce successful */
+                retval = 0;
+        }
+
+out:
+        clear_bit(port1, hub->busy_bits);
+        usb_autopm_put_interface(intf);
+        return retval;
+}
+
+static int usb_port_runtime_suspend(struct device *dev)
+{
+        struct usb_port *port_dev = to_usb_port(dev);
+        struct usb_device *hdev = to_usb_device(dev->parent->parent);
+        struct usb_interface *intf = to_usb_interface(dev->parent);
+        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
+        int port1 = port_dev->portnum;
+        int retval;
+
+        if (!hub)
+                return -EINVAL;
+
+        if (dev_pm_qos_flags(&port_dev->dev, PM_QOS_FLAG_NO_POWER_OFF)
+                        == PM_QOS_FLAGS_ALL)
+                return -EAGAIN;
+
+        usb_autopm_get_interface(intf);
+        set_bit(port1, hub->busy_bits);
+        retval = usb_hub_set_port_power(hdev, port1, false);
+        usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_CONNECTION);
+        usb_clear_port_feature(hdev, port1,     USB_PORT_FEAT_C_ENABLE);
+        clear_bit(port1, hub->busy_bits);
+        usb_autopm_put_interface(intf);
+        return retval;
+}
+#endif
+
+static const struct dev_pm_ops usb_port_pm_ops = {
+#ifdef CONFIG_USB_SUSPEND
+        .runtime_suspend =      usb_port_runtime_suspend,
+        .runtime_resume =       usb_port_runtime_resume,
+        .runtime_idle =         pm_generic_runtime_idle,
+#endif
+};
+
+struct device_type usb_port_device_type = {
+        .name =         "usb_port",
+        .release =      usb_port_device_release,
+        .pm =           &usb_port_pm_ops,
+};
+
+int usb_hub_create_port_device(struct usb_hub *hub, int port1)
+{
+        struct usb_port *port_dev = NULL;
+        int retval;
+
+        port_dev = kzalloc(sizeof(*port_dev), GFP_KERNEL);
+        if (!port_dev) {
+                retval = -ENOMEM;
+                goto exit;
+        }
+
+        hub->ports[port1 - 1] = port_dev;
+        port_dev->portnum = port1;
+        port_dev->power_is_on = true;
+        port_dev->dev.parent = hub->intfdev;
+        port_dev->dev.groups = port_dev_group;
+        port_dev->dev.type = &usb_port_device_type;
+        dev_set_name(&port_dev->dev, "port%d", port1);
+
+        retval = device_register(&port_dev->dev);
+        if (retval)
+                goto error_register;
+
+        pm_runtime_set_active(&port_dev->dev);
+
+        /* It would be dangerous if user space couldn't
+         * prevent usb device from being powered off. So don't
+         * enable port runtime pm if failed to expose port's pm qos.
+         */
+        if (!dev_pm_qos_expose_flags(&port_dev->dev,
+                        PM_QOS_FLAG_NO_POWER_OFF))
+                pm_runtime_enable(&port_dev->dev);
+
+        device_enable_async_suspend(&port_dev->dev);
+        return 0;
+
+error_register:
+        put_device(&port_dev->dev);
+exit:
+        return retval;
+}
+
+void usb_hub_remove_port_device(struct usb_hub *hub,
+                                       int port1)
+{
+        device_unregister(&hub->ports[port1 - 1]->dev);
+}
+
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 818e4a024d0d..3f81a3dc6867 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -17,7 +17,7 @@
 #include "usb.h"
 
 /* Active configuration fields */
-#define usb_actconfig_show(field, multiplier, format_string)            \
+#define usb_actconfig_show(field, format_string)                        \
 static ssize_t  show_##field(struct device *dev,                        \
                 struct device_attribute *attr, char *buf)               \
 {                                                                       \
@@ -28,18 +28,31 @@ static ssize_t  show_##field(struct device *dev,			\
         actconfig = udev->actconfig;                                    \
         if (actconfig)                                                  \
                 return sprintf(buf, format_string,                      \
-                                actconfig->desc.field * multiplier);    \
+                                actconfig->desc.field);                 \
         else                                                            \
                 return 0;                                               \
 }                                                                       \
 
-#define usb_actconfig_attr(field, multiplier, format_string)            \
-usb_actconfig_show(field, multiplier, format_string)                    \
-static DEVICE_ATTR(field, S_IRUGO, show_##field, NULL);
+#define usb_actconfig_attr(field, format_string)                \
+        usb_actconfig_show(field, format_string)                \
+        static DEVICE_ATTR(field, S_IRUGO, show_##field, NULL);
+
+usb_actconfig_attr(bNumInterfaces, "%2d\n")
+usb_actconfig_attr(bmAttributes, "%2x\n")
 
-usb_actconfig_attr(bNumInterfaces, 1, "%2d\n")
-usb_actconfig_attr(bmAttributes, 1, "%2x\n")
-usb_actconfig_attr(bMaxPower, 2, "%3dmA\n")
+static ssize_t show_bMaxPower(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct usb_device *udev;
+        struct usb_host_config *actconfig;
+
+        udev = to_usb_device(dev);
+        actconfig = udev->actconfig;
+        if (!actconfig)
+                return 0;
+        return sprintf(buf, "%dmA\n", usb_get_max_power(udev, actconfig));
+}
+static DEVICE_ATTR(bMaxPower, S_IRUGO, show_bMaxPower, NULL);
 
 static ssize_t show_configuration_string(struct device *dev,
                 struct device_attribute *attr, char *buf)
@@ -56,7 +69,7 @@ static ssize_t show_configuration_string(struct device *dev,
 static DEVICE_ATTR(configuration, S_IRUGO, show_configuration_string, NULL);
 
 /* configuration value is always present, and r/w */
-usb_actconfig_show(bConfigurationValue, 1, "%u\n");
+usb_actconfig_show(bConfigurationValue, "%u\n");
 
 static ssize_t
 set_bConfigurationValue(struct device *dev, struct device_attribute *attr,
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 1c528c1bf0be..a7f20bde0e5e 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -1,6 +1,7 @@
 #include <linux/pm.h>
 #include <linux/acpi.h>
 
+struct usb_hub_descriptor;
 struct dev_state;
 
 /* Functions local to drivers/usb/core/ */
@@ -38,6 +39,15 @@ extern char *usb_cache_string(struct usb_device *udev, int index);
 extern int usb_set_configuration(struct usb_device *dev, int configuration);
 extern int usb_choose_configuration(struct usb_device *udev);
 
+static inline unsigned usb_get_max_power(struct usb_device *udev,
+                struct usb_host_config *c)
+{
+        /* SuperSpeed power is in 8 mA units; others are in 2 mA units */
+        unsigned mul = (udev->speed == USB_SPEED_SUPER ? 8 : 2);
+
+        return c->desc.bMaxPower * mul;
+}
+
 extern void usb_kick_khubd(struct usb_device *dev);
 extern int usb_match_one_id_intf(struct usb_device *dev,
                                  struct usb_host_interface *intf,
@@ -173,6 +183,8 @@ extern enum usb_port_connect_type
         usb_get_hub_port_connect_type(struct usb_device *hdev, int port1);
 extern void usb_set_hub_port_connect_type(struct usb_device *hdev, int port1,
         enum usb_port_connect_type type);
+extern void usb_hub_adjust_deviceremovable(struct usb_device *hdev,
+                struct usb_hub_descriptor *desc);
 
 #ifdef CONFIG_ACPI
 extern int usb_acpi_register(void);
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index f6a6e070c2ac..68e9a2c5a01a 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -1,6 +1,6 @@
 config USB_DWC3
         tristate "DesignWare USB3 DRD Core Support"
-        depends on (USB && USB_GADGET)
+        depends on (USB || USB_GADGET) && GENERIC_HARDIRQS
         select USB_OTG_UTILS
         select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD
         help
@@ -12,6 +12,35 @@ config USB_DWC3
 
 if USB_DWC3
 
+choice
+        bool "DWC3 Mode Selection"
+        default USB_DWC3_DUAL_ROLE if (USB && USB_GADGET)
+        default USB_DWC3_HOST if (USB && !USB_GADGET)
+        default USB_DWC3_GADGET if (!USB && USB_GADGET)
+
+config USB_DWC3_HOST
+        bool "Host only mode"
+        depends on USB
+        help
+          Select this when you want to use DWC3 in host mode only,
+          thereby the gadget feature will be regressed.
+
+config USB_DWC3_GADGET
+        bool "Gadget only mode"
+        depends on USB_GADGET
+        help
+          Select this when you want to use DWC3 in gadget mode only,
+          thereby the host feature will be regressed.
+
+config USB_DWC3_DUAL_ROLE
+        bool "Dual Role mode"
+        depends on (USB && USB_GADGET)
+        help
+          This is the default mode of working of DWC3 controller where
+          both host and gadget features are enabled.
+
+endchoice
+
 config USB_DWC3_DEBUG
         bool "Enable Debugging Messages"
         help
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index 4502648b8171..0c7ac92582be 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -4,8 +4,14 @@ ccflags-$(CONFIG_USB_DWC3_VERBOSE)	+= -DVERBOSE_DEBUG
 obj-$(CONFIG_USB_DWC3)                  += dwc3.o
 
 dwc3-y                                  := core.o
-dwc3-y                                  += host.o
-dwc3-y                                  += gadget.o ep0.o
+
+ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
+        dwc3-y                          += host.o
+endif
+
+ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
+        dwc3-y                          += gadget.o ep0.o
+endif
 
 ifneq ($(CONFIG_DEBUG_FS),)
         dwc3-y                          += debugfs.o
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 3a4004a620ad..999909451e37 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -420,18 +420,27 @@ static int dwc3_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+        if (node) {
+                dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0);
+                dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 1);
+        } else {
+                dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+                dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3);
+        }
+
         if (IS_ERR_OR_NULL(dwc->usb2_phy)) {
                 dev_err(dev, "no usb2 phy configured\n");
                 return -EPROBE_DEFER;
         }
 
-        dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3);
         if (IS_ERR_OR_NULL(dwc->usb3_phy)) {
                 dev_err(dev, "no usb3 phy configured\n");
                 return -EPROBE_DEFER;
         }
 
+        usb_phy_set_suspend(dwc->usb2_phy, 0);
+        usb_phy_set_suspend(dwc->usb3_phy, 0);
+
         spin_lock_init(&dwc->lock);
         platform_set_drvdata(pdev, dwc);
 
@@ -450,8 +459,7 @@ static int dwc3_probe(struct platform_device *pdev)
         else
                 dwc->maximum_speed = DWC3_DCFG_SUPERSPEED;
 
-        if (of_get_property(node, "tx-fifo-resize", NULL))
-                dwc->needs_fifo_resize = true;
+        dwc->needs_fifo_resize = of_property_read_bool(node, "tx-fifo-resize");
 
         pm_runtime_enable(dev);
         pm_runtime_get_sync(dev);
@@ -550,9 +558,9 @@ err0:
 static int dwc3_remove(struct platform_device *pdev)
 {
         struct dwc3     *dwc = platform_get_drvdata(pdev);
-        struct resource *res;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        usb_phy_set_suspend(dwc->usb2_phy, 1);
+        usb_phy_set_suspend(dwc->usb3_phy, 1);
 
         pm_runtime_put(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
@@ -580,11 +588,22 @@ static int dwc3_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id of_dwc3_match[] = {
+        {
+                .compatible = "synopsys,dwc3"
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(of, of_dwc3_match);
+#endif
+
 static struct platform_driver dwc3_driver = {
         .probe          = dwc3_probe,
         .remove         = dwc3_remove,
         .driver         = {
                 .name   = "dwc3",
+                .of_match_table = of_match_ptr(of_dwc3_match),
         },
 };
 
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 499956344262..b41750660235 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -55,7 +55,9 @@
 #define DWC3_ENDPOINTS_NUM      32
 #define DWC3_XHCI_RESOURCES_NUM 2
 
-#define DWC3_EVENT_BUFFERS_SIZE PAGE_SIZE
+#define DWC3_EVENT_SIZE         4       /* bytes */
+#define DWC3_EVENT_MAX_NUM      64      /* 2 events/endpoint */
+#define DWC3_EVENT_BUFFERS_SIZE (DWC3_EVENT_SIZE * DWC3_EVENT_MAX_NUM)
 #define DWC3_EVENT_TYPE_MASK    0xfe
 
 #define DWC3_EVENT_TYPE_DEV     0
@@ -405,7 +407,6 @@ struct dwc3_event_buffer {
  * @number: endpoint number (1 - 15)
  * @type: set to bmAttributes & USB_ENDPOINT_XFERTYPE_MASK
  * @resource_index: Resource transfer index
- * @current_uf: Current uf received through last event parameter
  * @interval: the intervall on which the ISOC transfer is started
  * @name: a human readable name e.g. ep1out-bulk
  * @direction: true for TX, false for RX
@@ -439,7 +440,6 @@ struct dwc3_ep {
         u8                      number;
         u8                      type;
         u8                      resource_index;
-        u16                     current_uf;
         u32                     interval;
 
         char                    name[20];
@@ -581,6 +581,7 @@ struct dwc3_request {
         struct usb_request      request;
         struct list_head        list;
         struct dwc3_ep          *dep;
+        u32                     start_slot;
 
         u8                      epnum;
         struct dwc3_trb         *trb;
@@ -721,6 +722,7 @@ struct dwc3 {
 
         struct dwc3_hwparams    hwparams;
         struct dentry           *root;
+        struct debugfs_regset32 *regset;
 
         u8                      test_mode;
         u8                      test_mode_nr;
@@ -862,10 +864,24 @@ union dwc3_event {
 void dwc3_set_mode(struct dwc3 *dwc, u32 mode);
 int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc);
 
+#if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)
 int dwc3_host_init(struct dwc3 *dwc);
 void dwc3_host_exit(struct dwc3 *dwc);
-
+#else
+static inline int dwc3_host_init(struct dwc3 *dwc)
+{ return 0; }
+static inline void dwc3_host_exit(struct dwc3 *dwc)
+{ }
+#endif
+
+#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)
 int dwc3_gadget_init(struct dwc3 *dwc);
 void dwc3_gadget_exit(struct dwc3 *dwc);
+#else
+static inline int dwc3_gadget_init(struct dwc3 *dwc)
+{ return 0; }
+static inline void dwc3_gadget_exit(struct dwc3 *dwc)
+{ }
+#endif
 
 #endif /* __DRIVERS_USB_DWC3_CORE_H */
diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c
index 5945aadaa1c9..4a752e730c5f 100644
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -59,7 +59,7 @@
         .offset = DWC3_ ##nm - DWC3_GLOBALS_REGS_START, \
 }
 
-static const struct debugfs_reg32 dwc3_regs[] = {
+static struct debugfs_reg32 dwc3_regs[] = {
         dump_register(GSBUSCFG0),
         dump_register(GSBUSCFG1),
         dump_register(GTXTHRCFG),
@@ -376,27 +376,6 @@ static const struct debugfs_reg32 dwc3_regs[] = {
         dump_register(OSTS),
 };
 
-static int dwc3_regdump_show(struct seq_file *s, void *unused)
-{
-        struct dwc3             *dwc = s->private;
-
-        seq_printf(s, "DesignWare USB3 Core Register Dump\n");
-        debugfs_print_regs32(s, dwc3_regs, ARRAY_SIZE(dwc3_regs),
-                             dwc->regs, "");
-        return 0;
-}
-
-static int dwc3_regdump_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, dwc3_regdump_show, inode->i_private);
-}
-
-static const struct file_operations dwc3_regdump_fops = {
-        .open                   = dwc3_regdump_open,
-        .read                   = seq_read,
-        .release                = single_release,
-};
-
 static int dwc3_mode_show(struct seq_file *s, void *unused)
 {
         struct dwc3             *dwc = s->private;
@@ -666,13 +645,23 @@ int dwc3_debugfs_init(struct dwc3 *dwc)
 
         dwc->root = root;
 
-        file = debugfs_create_file("regdump", S_IRUGO, root, dwc,
-                        &dwc3_regdump_fops);
+        dwc->regset = kzalloc(sizeof(*dwc->regset), GFP_KERNEL);
+        if (!dwc->regset) {
+                ret = -ENOMEM;
+                goto err1;
+        }
+
+        dwc->regset->regs = dwc3_regs;
+        dwc->regset->nregs = ARRAY_SIZE(dwc3_regs);
+        dwc->regset->base = dwc->regs;
+
+        file = debugfs_create_regset32("regdump", S_IRUGO, root, dwc->regset);
         if (!file) {
                 ret = -ENOMEM;
                 goto err1;
         }
 
+#if IS_ENABLED(CONFIG_USB_DWC3_GADGET)
         file = debugfs_create_file("mode", S_IRUGO | S_IWUSR, root,
                         dwc, &dwc3_mode_fops);
         if (!file) {
@@ -693,6 +682,7 @@ int dwc3_debugfs_init(struct dwc3 *dwc)
                 ret = -ENOMEM;
                 goto err1;
         }
+#endif
 
         return 0;
 
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index aae5328ac771..b50da53e9a52 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -42,7 +42,7 @@ static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos)
 
         memset(&pdata, 0x00, sizeof(pdata));
 
-        pdev = platform_device_alloc("nop_usb_xceiv", 0);
+        pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO);
         if (!pdev)
                 return -ENOMEM;
 
@@ -53,7 +53,7 @@ static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos)
         if (ret)
                 goto err1;
 
-        pdev = platform_device_alloc("nop_usb_xceiv", 1);
+        pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO);
         if (!pdev) {
                 ret = -ENOMEM;
                 goto err1;
@@ -95,13 +95,14 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         struct platform_device  *dwc3;
         struct dwc3_exynos      *exynos;
         struct clk              *clk;
+        struct device           *dev = &pdev->dev;
 
         int                     ret = -ENOMEM;
 
-        exynos = kzalloc(sizeof(*exynos), GFP_KERNEL);
+        exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
         if (!exynos) {
-                dev_err(&pdev->dev, "not enough memory\n");
-                goto err0;
+                dev_err(dev, "not enough memory\n");
+                return -ENOMEM;
         }
 
         /*
@@ -116,30 +117,30 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
 
         ret = dwc3_exynos_register_phys(exynos);
         if (ret) {
-                dev_err(&pdev->dev, "couldn't register PHYs\n");
-                goto err1;
+                dev_err(dev, "couldn't register PHYs\n");
+                return ret;
         }
 
         dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
         if (!dwc3) {
-                dev_err(&pdev->dev, "couldn't allocate dwc3 device\n");
-                goto err1;
+                dev_err(dev, "couldn't allocate dwc3 device\n");
+                return -ENOMEM;
         }
 
-        clk = clk_get(&pdev->dev, "usbdrd30");
+        clk = devm_clk_get(dev, "usbdrd30");
         if (IS_ERR(clk)) {
-                dev_err(&pdev->dev, "couldn't get clock\n");
+                dev_err(dev, "couldn't get clock\n");
                 ret = -EINVAL;
-                goto err3;
+                goto err1;
         }
 
-        dma_set_coherent_mask(&dwc3->dev, pdev->dev.coherent_dma_mask);
+        dma_set_coherent_mask(&dwc3->dev, dev->coherent_dma_mask);
 
-        dwc3->dev.parent = &pdev->dev;
-        dwc3->dev.dma_mask = pdev->dev.dma_mask;
-        dwc3->dev.dma_parms = pdev->dev.dma_parms;
+        dwc3->dev.parent = dev;
+        dwc3->dev.dma_mask = dev->dma_mask;
+        dwc3->dev.dma_parms = dev->dma_parms;
         exynos->dwc3    = dwc3;
-        exynos->dev     = &pdev->dev;
+        exynos->dev     = dev;
         exynos->clk     = clk;
 
         clk_enable(exynos->clk);
@@ -147,26 +148,23 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         ret = platform_device_add_resources(dwc3, pdev->resource,
                         pdev->num_resources);
         if (ret) {
-                dev_err(&pdev->dev, "couldn't add resources to dwc3 device\n");
-                goto err4;
+                dev_err(dev, "couldn't add resources to dwc3 device\n");
+                goto err2;
         }
 
         ret = platform_device_add(dwc3);
         if (ret) {
-                dev_err(&pdev->dev, "failed to register dwc3 device\n");
-                goto err4;
+                dev_err(dev, "failed to register dwc3 device\n");
+                goto err2;
         }
 
         return 0;
 
-err4:
+err2:
         clk_disable(clk);
-        clk_put(clk);
-err3:
-        platform_device_put(dwc3);
 err1:
-        kfree(exynos);
-err0:
+        platform_device_put(dwc3);
+
         return ret;
 }
 
@@ -179,16 +177,13 @@ static int dwc3_exynos_remove(struct platform_device *pdev)
         platform_device_unregister(exynos->usb3_phy);
 
         clk_disable(exynos->clk);
-        clk_put(exynos->clk);
-
-        kfree(exynos);
 
         return 0;
 }
 
 #ifdef CONFIG_OF
 static const struct of_device_id exynos_dwc3_match[] = {
-        { .compatible = "samsung,exynos-dwc3" },
+        { .compatible = "samsung,exynos5250-dwusb3" },
         {},
 };
 MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index f31867fd2574..22f337f57219 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -43,10 +43,13 @@
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/dwc3-omap.h>
+#include <linux/usb/dwc3-omap.h>
+#include <linux/pm_runtime.h>
 #include <linux/dma-mapping.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/of_platform.h>
 
 #include <linux/usb/otg.h>
 #include <linux/usb/nop-usb-xceiv.h>
@@ -78,23 +81,6 @@
 
 /* SYSCONFIG REGISTER */
 #define USBOTGSS_SYSCONFIG_DMADISABLE           (1 << 16)
-#define USBOTGSS_SYSCONFIG_STANDBYMODE(x)       ((x) << 4)
-
-#define USBOTGSS_STANDBYMODE_FORCE_STANDBY      0
-#define USBOTGSS_STANDBYMODE_NO_STANDBY         1
-#define USBOTGSS_STANDBYMODE_SMART_STANDBY      2
-#define USBOTGSS_STANDBYMODE_SMART_WAKEUP       3
-
-#define USBOTGSS_STANDBYMODE_MASK               (0x03 << 4)
-
-#define USBOTGSS_SYSCONFIG_IDLEMODE(x)          ((x) << 2)
-
-#define USBOTGSS_IDLEMODE_FORCE_IDLE            0
-#define USBOTGSS_IDLEMODE_NO_IDLE               1
-#define USBOTGSS_IDLEMODE_SMART_IDLE            2
-#define USBOTGSS_IDLEMODE_SMART_WAKEUP          3
-
-#define USBOTGSS_IDLEMODE_MASK                  (0x03 << 2)
 
 /* IRQ_EOI REGISTER */
 #define USBOTGSS_IRQ_EOI_LINE_NUMBER            (1 << 0)
@@ -133,7 +119,6 @@ struct dwc3_omap {
         /* device lock */
         spinlock_t              lock;
 
-        struct platform_device  *dwc3;
         struct platform_device  *usb2_phy;
         struct platform_device  *usb3_phy;
         struct device           *dev;
@@ -147,6 +132,8 @@ struct dwc3_omap {
         u32                     dma_status:1;
 };
 
+struct dwc3_omap                *_omap;
+
 static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
 {
         return readl(base + offset);
@@ -157,6 +144,57 @@ static inline void dwc3_omap_writel(void __iomem *base, u32 offset, u32 value)
         writel(value, base + offset);
 }
 
+void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
+{
+        u32                     val;
+        struct dwc3_omap        *omap = _omap;
+
+        switch (status) {
+        case OMAP_DWC3_ID_GROUND:
+                dev_dbg(omap->dev, "ID GND\n");
+
+                val = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
+                val &= ~(USBOTGSS_UTMI_OTG_STATUS_IDDIG
+                                | USBOTGSS_UTMI_OTG_STATUS_VBUSVALID
+                                | USBOTGSS_UTMI_OTG_STATUS_SESSEND);
+                val |= USBOTGSS_UTMI_OTG_STATUS_SESSVALID
+                                | USBOTGSS_UTMI_OTG_STATUS_POWERPRESENT;
+                dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS, val);
+                break;
+
+        case OMAP_DWC3_VBUS_VALID:
+                dev_dbg(omap->dev, "VBUS Connect\n");
+
+                val = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
+                val &= ~USBOTGSS_UTMI_OTG_STATUS_SESSEND;
+                val |= USBOTGSS_UTMI_OTG_STATUS_IDDIG
+                                | USBOTGSS_UTMI_OTG_STATUS_VBUSVALID
+                                | USBOTGSS_UTMI_OTG_STATUS_SESSVALID
+                                | USBOTGSS_UTMI_OTG_STATUS_POWERPRESENT;
+                dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS, val);
+                break;
+
+        case OMAP_DWC3_ID_FLOAT:
+        case OMAP_DWC3_VBUS_OFF:
+                dev_dbg(omap->dev, "VBUS Disconnect\n");
+
+                val = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
+                val &= ~(USBOTGSS_UTMI_OTG_STATUS_SESSVALID
+                                | USBOTGSS_UTMI_OTG_STATUS_VBUSVALID
+                                | USBOTGSS_UTMI_OTG_STATUS_POWERPRESENT);
+                val |= USBOTGSS_UTMI_OTG_STATUS_SESSEND
+                                | USBOTGSS_UTMI_OTG_STATUS_IDDIG;
+                dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS, val);
+                break;
+
+        default:
+                dev_dbg(omap->dev, "ID float\n");
+        }
+
+        return;
+}
+EXPORT_SYMBOL_GPL(dwc3_omap_mailbox);
+
 static int dwc3_omap_register_phys(struct dwc3_omap *omap)
 {
         struct nop_usb_xceiv_platform_data pdata;
@@ -165,7 +203,7 @@ static int dwc3_omap_register_phys(struct dwc3_omap *omap)
 
         memset(&pdata, 0x00, sizeof(pdata));
 
-        pdev = platform_device_alloc("nop_usb_xceiv", 0);
+        pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO);
         if (!pdev)
                 return -ENOMEM;
 
@@ -176,7 +214,7 @@ static int dwc3_omap_register_phys(struct dwc3_omap *omap)
         if (ret)
                 goto err1;
 
-        pdev = platform_device_alloc("nop_usb_xceiv", 1);
+        pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO);
         if (!pdev) {
                 ret = -ENOMEM;
                 goto err1;
@@ -262,12 +300,20 @@ static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap)
         return IRQ_HANDLED;
 }
 
+static int dwc3_omap_remove_core(struct device *dev, void *c)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+
+        platform_device_unregister(pdev);
+
+        return 0;
+}
+
 static int dwc3_omap_probe(struct platform_device *pdev)
 {
         struct dwc3_omap_data   *pdata = pdev->dev.platform_data;
         struct device_node      *node = pdev->dev.of_node;
 
-        struct platform_device  *dwc3;
         struct dwc3_omap        *omap;
         struct resource         *res;
         struct device           *dev = &pdev->dev;
@@ -314,30 +360,32 @@ static int dwc3_omap_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
-        if (!dwc3) {
-                dev_err(dev, "couldn't allocate dwc3 device\n");
-                return -ENOMEM;
-        }
-
         context = devm_kzalloc(dev, resource_size(res), GFP_KERNEL);
         if (!context) {
                 dev_err(dev, "couldn't allocate dwc3 context memory\n");
-                goto err2;
+                return -ENOMEM;
         }
 
         spin_lock_init(&omap->lock);
-        dma_set_coherent_mask(&dwc3->dev, dev->coherent_dma_mask);
 
-        dwc3->dev.parent = dev;
-        dwc3->dev.dma_mask = dev->dma_mask;
-        dwc3->dev.dma_parms = dev->dma_parms;
         omap->resource_size = resource_size(res);
         omap->context   = context;
         omap->dev       = dev;
         omap->irq       = irq;
         omap->base      = base;
-        omap->dwc3      = dwc3;
+
+        /*
+         * REVISIT if we ever have two instances of the wrapper, we will be
+         * in big trouble
+         */
+        _omap   = omap;
+
+        pm_runtime_enable(dev);
+        ret = pm_runtime_get_sync(dev);
+        if (ret < 0) {
+                dev_err(dev, "get_sync failed with err %d\n", ret);
+                return ret;
+        }
 
         reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
 
@@ -368,21 +416,12 @@ static int dwc3_omap_probe(struct platform_device *pdev)
         reg = dwc3_omap_readl(omap->base, USBOTGSS_SYSCONFIG);
         omap->dma_status = !!(reg & USBOTGSS_SYSCONFIG_DMADISABLE);
 
-        /* Set No-Idle and No-Standby */
-        reg &= ~(USBOTGSS_STANDBYMODE_MASK
-                        | USBOTGSS_IDLEMODE_MASK);
-
-        reg |= (USBOTGSS_SYSCONFIG_STANDBYMODE(USBOTGSS_STANDBYMODE_NO_STANDBY)
-                | USBOTGSS_SYSCONFIG_IDLEMODE(USBOTGSS_IDLEMODE_NO_IDLE));
-
-        dwc3_omap_writel(omap->base, USBOTGSS_SYSCONFIG, reg);
-
         ret = devm_request_irq(dev, omap->irq, dwc3_omap_interrupt, 0,
                         "dwc3-omap", omap);
         if (ret) {
                 dev_err(dev, "failed to request IRQ #%d --> %d\n",
                                 omap->irq, ret);
-                goto err2;
+                return ret;
         }
 
         /* enable all IRQs */
@@ -401,33 +440,28 @@ static int dwc3_omap_probe(struct platform_device *pdev)
 
         dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg);
 
-        ret = platform_device_add_resources(dwc3, pdev->resource,
-                        pdev->num_resources);
-        if (ret) {
-                dev_err(dev, "couldn't add resources to dwc3 device\n");
-                goto err2;
-        }
-
-        ret = platform_device_add(dwc3);
-        if (ret) {
-                dev_err(dev, "failed to register dwc3 device\n");
-                goto err2;
+        if (node) {
+                ret = of_platform_populate(node, NULL, NULL, dev);
+                if (ret) {
+                        dev_err(&pdev->dev,
+                                "failed to add create dwc3 core\n");
+                        return ret;
+                }
         }
 
         return 0;
-
-err2:
-        platform_device_put(dwc3);
-        return ret;
 }
 
 static int dwc3_omap_remove(struct platform_device *pdev)
 {
         struct dwc3_omap        *omap = platform_get_drvdata(pdev);
 
-        platform_device_unregister(omap->dwc3);
         platform_device_unregister(omap->usb2_phy);
         platform_device_unregister(omap->usb3_phy);
+        pm_runtime_put_sync(&pdev->dev);
+        pm_runtime_disable(&pdev->dev);
+        device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core);
+
         return 0;
 }
 
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 2fdd767f8fe8..a04342f6cbfa 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -241,21 +241,23 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
                 int status)
 {
         struct dwc3                     *dwc = dep->dwc;
+        int                             i;
 
         if (req->queued) {
-                if (req->request.num_mapped_sgs)
-                        dep->busy_slot += req->request.num_mapped_sgs;
-                else
+                i = 0;
+                do {
                         dep->busy_slot++;
-
-                /*
-                 * Skip LINK TRB. We can't use req->trb and check for
-                 * DWC3_TRBCTL_LINK_TRB because it points the TRB we just
-                 * completed (not the LINK TRB).
-                 */
-                if (((dep->busy_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
+                        /*
+                         * Skip LINK TRB. We can't use req->trb and check for
+                         * DWC3_TRBCTL_LINK_TRB because it points the TRB we
+                         * just completed (not the LINK TRB).
+                         */
+                        if (((dep->busy_slot & DWC3_TRB_MASK) ==
+                                DWC3_TRB_NUM- 1) &&
                                 usb_endpoint_xfer_isoc(dep->endpoint.desc))
-                        dep->busy_slot++;
+                                dep->busy_slot++;
+                } while(++i < req->request.num_mapped_sgs);
+                req->queued = false;
         }
         list_del(&req->list);
         req->trb = NULL;
@@ -749,33 +751,32 @@ static void dwc3_gadget_ep_free_request(struct usb_ep *ep,
  */
 static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
                 struct dwc3_request *req, dma_addr_t dma,
-                unsigned length, unsigned last, unsigned chain)
+                unsigned length, unsigned last, unsigned chain, unsigned node)
 {
         struct dwc3             *dwc = dep->dwc;
         struct dwc3_trb         *trb;
 
-        unsigned int            cur_slot;
-
         dev_vdbg(dwc->dev, "%s: req %p dma %08llx length %d%s%s\n",
                         dep->name, req, (unsigned long long) dma,
                         length, last ? " last" : "",
                         chain ? " chain" : "");
 
-        trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];
-        cur_slot = dep->free_slot;
-        dep->free_slot++;
-
         /* Skip the LINK-TRB on ISOC */
-        if (((cur_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
+        if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
                         usb_endpoint_xfer_isoc(dep->endpoint.desc))
-                return;
+                dep->free_slot++;
+
+        trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];
 
         if (!req->trb) {
                 dwc3_gadget_move_request_queued(req);
                 req->trb = trb;
                 req->trb_dma = dwc3_trb_dma_offset(dep, trb);
+                req->start_slot = dep->free_slot & DWC3_TRB_MASK;
         }
 
+        dep->free_slot++;
+
         trb->size = DWC3_TRB_SIZE_LENGTH(length);
         trb->bpl = lower_32_bits(dma);
         trb->bph = upper_32_bits(dma);
@@ -786,9 +787,12 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
                 break;
 
         case USB_ENDPOINT_XFER_ISOC:
-                trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS_FIRST;
+                if (!node)
+                        trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS_FIRST;
+                else
+                        trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS;
 
-                if (!req->request.no_interrupt)
+                if (!req->request.no_interrupt && !chain)
                         trb->ctrl |= DWC3_TRB_CTRL_IOC;
                 break;
 
@@ -807,14 +811,13 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
         if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
                 trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI;
                 trb->ctrl |= DWC3_TRB_CTRL_CSP;
-        } else {
-                if (chain)
-                        trb->ctrl |= DWC3_TRB_CTRL_CHN;
-
-                if (last)
-                        trb->ctrl |= DWC3_TRB_CTRL_LST;
+        } else if (last) {
+                trb->ctrl |= DWC3_TRB_CTRL_LST;
         }
 
+        if (chain)
+                trb->ctrl |= DWC3_TRB_CTRL_CHN;
+
         if (usb_endpoint_xfer_bulk(dep->endpoint.desc) && dep->stream_capable)
                 trb->ctrl |= DWC3_TRB_CTRL_SID_SOFN(req->request.stream_id);
 
@@ -885,6 +888,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
         list_for_each_entry_safe(req, n, &dep->request_list, list) {
                 unsigned        length;
                 dma_addr_t      dma;
+                last_one = false;
 
                 if (req->request.num_mapped_sgs > 0) {
                         struct usb_request *request = &req->request;
@@ -900,7 +904,9 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
 
                                 if (i == (request->num_mapped_sgs - 1) ||
                                                 sg_is_last(s)) {
-                                        last_one = true;
+                                        if (list_is_last(&req->list,
+                                                        &dep->request_list))
+                                                last_one = true;
                                         chain = false;
                                 }
 
@@ -912,7 +918,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
                                         chain = false;
 
                                 dwc3_prepare_one_trb(dep, req, dma, length,
-                                                last_one, chain);
+                                                last_one, chain, i);
 
                                 if (last_one)
                                         break;
@@ -930,7 +936,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
                                 last_one = 1;
 
                         dwc3_prepare_one_trb(dep, req, dma, length,
-                                        last_one, false);
+                                        last_one, false, 0);
 
                         if (last_one)
                                 break;
@@ -977,13 +983,14 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param,
         }
 
         memset(&params, 0, sizeof(params));
-        params.param0 = upper_32_bits(req->trb_dma);
-        params.param1 = lower_32_bits(req->trb_dma);
 
-        if (start_new)
+        if (start_new) {
+                params.param0 = upper_32_bits(req->trb_dma);
+                params.param1 = lower_32_bits(req->trb_dma);
                 cmd = DWC3_DEPCMD_STARTTRANSFER;
-        else
+        } else {
                 cmd = DWC3_DEPCMD_UPDATETRANSFER;
+        }
 
         cmd |= DWC3_DEPCMD_PARAM(cmd_param);
         ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, &params);
@@ -1082,8 +1089,6 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
          *
          */
         if (dep->flags & DWC3_EP_PENDING_REQUEST) {
-                int     ret;
-
                 /*
                  * If xfernotready is already elapsed and it is a case
                  * of isoc transfer, then issue END TRANSFER, so that
@@ -1091,7 +1096,10 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
                  * notion of current microframe.
                  */
                 if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
-                        dwc3_stop_active_transfer(dwc, dep->number);
+                        if (list_empty(&dep->req_queued)) {
+                                dwc3_stop_active_transfer(dwc, dep->number);
+                                dep->flags = DWC3_EP_ENABLED;
+                        }
                         return 0;
                 }
 
@@ -1099,6 +1107,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
                 if (ret && ret != -EBUSY)
                         dev_dbg(dwc->dev, "%s: failed to kick transfers\n",
                                         dep->name);
+                return ret;
         }
 
         /*
@@ -1115,16 +1124,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
                 if (ret && ret != -EBUSY)
                         dev_dbg(dwc->dev, "%s: failed to kick transfers\n",
                                         dep->name);
-        }
-
-        /*
-         * 3. Missed ISOC Handling. We need to start isoc transfer on the saved
-         * uframe number.
-         */
-        if (usb_endpoint_xfer_isoc(dep->endpoint.desc) &&
-                (dep->flags & DWC3_EP_MISSED_ISOC)) {
-                        __dwc3_gadget_start_isoc(dwc, dep, dep->current_uf);
-                        dep->flags &= ~DWC3_EP_MISSED_ISOC;
+                return ret;
         }
 
         return 0;
@@ -1652,76 +1652,134 @@ static void dwc3_gadget_release(struct device *dev)
 }
 
 /* -------------------------------------------------------------------------- */
-static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
+static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep,
+                struct dwc3_request *req, struct dwc3_trb *trb,
                 const struct dwc3_event_depevt *event, int status)
 {
-        struct dwc3_request     *req;
-        struct dwc3_trb         *trb;
         unsigned int            count;
         unsigned int            s_pkt = 0;
         unsigned int            trb_status;
 
+        if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN)
+                /*
+                 * We continue despite the error. There is not much we
+                 * can do. If we don't clean it up we loop forever. If
+                 * we skip the TRB then it gets overwritten after a
+                 * while since we use them in a ring buffer. A BUG()
+                 * would help. Lets hope that if this occurs, someone
+                 * fixes the root cause instead of looking away :)
+                 */
+                dev_err(dwc->dev, "%s's TRB (%p) still owned by HW\n",
+                                dep->name, trb);
+        count = trb->size & DWC3_TRB_SIZE_MASK;
+
+        if (dep->direction) {
+                if (count) {
+                        trb_status = DWC3_TRB_SIZE_TRBSTS(trb->size);
+                        if (trb_status == DWC3_TRBSTS_MISSED_ISOC) {
+                                dev_dbg(dwc->dev, "incomplete IN transfer %s\n",
+                                                dep->name);
+                                /*
+                                 * If missed isoc occurred and there is
+                                 * no request queued then issue END
+                                 * TRANSFER, so that core generates
+                                 * next xfernotready and we will issue
+                                 * a fresh START TRANSFER.
+                                 * If there are still queued request
+                                 * then wait, do not issue either END
+                                 * or UPDATE TRANSFER, just attach next
+                                 * request in request_list during
+                                 * giveback.If any future queued request
+                                 * is successfully transferred then we
+                                 * will issue UPDATE TRANSFER for all
+                                 * request in the request_list.
+                                 */
+                                dep->flags |= DWC3_EP_MISSED_ISOC;
+                        } else {
+                                dev_err(dwc->dev, "incomplete IN transfer %s\n",
+                                                dep->name);
+                                status = -ECONNRESET;
+                        }
+                } else {
+                        dep->flags &= ~DWC3_EP_MISSED_ISOC;
+                }
+        } else {
+                if (count && (event->status & DEPEVT_STATUS_SHORT))
+                        s_pkt = 1;
+        }
+
+        /*
+         * We assume here we will always receive the entire data block
+         * which we should receive. Meaning, if we program RX to
+         * receive 4K but we receive only 2K, we assume that's all we
+         * should receive and we simply bounce the request back to the
+         * gadget driver for further processing.
+         */
+        req->request.actual += req->request.length - count;
+        if (s_pkt)
+                return 1;
+        if ((event->status & DEPEVT_STATUS_LST) &&
+                        (trb->ctrl & (DWC3_TRB_CTRL_LST |
+                                DWC3_TRB_CTRL_HWO)))
+                return 1;
+        if ((event->status & DEPEVT_STATUS_IOC) &&
+                        (trb->ctrl & DWC3_TRB_CTRL_IOC))
+                return 1;
+        return 0;
+}
+
+static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
+                const struct dwc3_event_depevt *event, int status)
+{
+        struct dwc3_request     *req;
+        struct dwc3_trb         *trb;
+        unsigned int            slot;
+        unsigned int            i;
+        int                     ret;
+
         do {
                 req = next_request(&dep->req_queued);
                 if (!req) {
                         WARN_ON_ONCE(1);
                         return 1;
                 }
+                i = 0;
+                do {
+                        slot = req->start_slot + i;
+                        if ((slot == DWC3_TRB_NUM - 1) &&
+                                usb_endpoint_xfer_isoc(dep->endpoint.desc))
+                                slot++;
+                        slot %= DWC3_TRB_NUM;
+                        trb = &dep->trb_pool[slot];
 
-                trb = req->trb;
+                        ret = __dwc3_cleanup_done_trbs(dwc, dep, req, trb,
+                                        event, status);
+                        if (ret)
+                                break;
+                }while (++i < req->request.num_mapped_sgs);
 
-                if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN)
+                dwc3_gadget_giveback(dep, req, status);
+
+                if (ret)
+                        break;
+        } while (1);
+
+        if (usb_endpoint_xfer_isoc(dep->endpoint.desc) &&
+                        list_empty(&dep->req_queued)) {
+                if (list_empty(&dep->request_list)) {
                         /*
-                         * We continue despite the error. There is not much we
-                         * can do. If we don't clean it up we loop forever. If
-                         * we skip the TRB then it gets overwritten after a
-                         * while since we use them in a ring buffer. A BUG()
-                         * would help. Lets hope that if this occurs, someone
-                         * fixes the root cause instead of looking away :)
+                         * If there is no entry in request list then do
+                         * not issue END TRANSFER now. Just set PENDING
+                         * flag, so that END TRANSFER is issued when an
+                         * entry is added into request list.
                          */
-                        dev_err(dwc->dev, "%s's TRB (%p) still owned by HW\n",
-                                        dep->name, req->trb);
-                count = trb->size & DWC3_TRB_SIZE_MASK;
-
-                if (dep->direction) {
-                        if (count) {
-                                trb_status = DWC3_TRB_SIZE_TRBSTS(trb->size);
-                                if (trb_status == DWC3_TRBSTS_MISSED_ISOC) {
-                                        dev_dbg(dwc->dev, "incomplete IN transfer %s\n",
-                                                        dep->name);
-                                        dep->current_uf = event->parameters &
-                                                ~(dep->interval - 1);
-                                        dep->flags |= DWC3_EP_MISSED_ISOC;
-                                } else {
-                                        dev_err(dwc->dev, "incomplete IN transfer %s\n",
-                                                        dep->name);
-                                        status = -ECONNRESET;
-                                }
-                        }
+                        dep->flags = DWC3_EP_PENDING_REQUEST;
                 } else {
-                        if (count && (event->status & DEPEVT_STATUS_SHORT))
-                                s_pkt = 1;
+                        dwc3_stop_active_transfer(dwc, dep->number);
+                        dep->flags = DWC3_EP_ENABLED;
                 }
-
-                /*
-                 * We assume here we will always receive the entire data block
-                 * which we should receive. Meaning, if we program RX to
-                 * receive 4K but we receive only 2K, we assume that's all we
-                 * should receive and we simply bounce the request back to the
-                 * gadget driver for further processing.
-                 */
-                req->request.actual += req->request.length - count;
-                dwc3_gadget_giveback(dep, req, status);
-                if (s_pkt)
-                        break;
-                if ((event->status & DEPEVT_STATUS_LST) &&
-                                (trb->ctrl & (DWC3_TRB_CTRL_LST |
-                                                DWC3_TRB_CTRL_HWO)))
-                        break;
-                if ((event->status & DEPEVT_STATUS_IOC) &&
-                                (trb->ctrl & DWC3_TRB_CTRL_IOC))
-                        break;
-        } while (1);
+                return 1;
+        }
 
         if ((event->status & DEPEVT_STATUS_IOC) &&
                         (trb->ctrl & DWC3_TRB_CTRL_IOC))
@@ -2157,6 +2215,26 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
                 break;
         }
 
+        /* Enable USB2 LPM Capability */
+
+        if ((dwc->revision > DWC3_REVISION_194A)
+                        && (speed != DWC3_DCFG_SUPERSPEED)) {
+                reg = dwc3_readl(dwc->regs, DWC3_DCFG);
+                reg |= DWC3_DCFG_LPM_CAP;
+                dwc3_writel(dwc->regs, DWC3_DCFG, reg);
+
+                reg = dwc3_readl(dwc->regs, DWC3_DCTL);
+                reg &= ~(DWC3_DCTL_HIRD_THRES_MASK | DWC3_DCTL_L1_HIBER_EN);
+
+                /*
+                 * TODO: This should be configurable. For now using
+                 * maximum allowed HIRD threshold value of 0b1100
+                 */
+                reg |= DWC3_DCTL_HIRD_THRES(12);
+
+                dwc3_writel(dwc->regs, DWC3_DCTL, reg);
+        }
+
         /* Recent versions support automatic phy suspend and don't need this */
         if (dwc->revision < DWC3_REVISION_194A) {
                 /* Suspend unneeded PHY */
@@ -2463,20 +2541,8 @@ int dwc3_gadget_init(struct dwc3 *dwc)
                         DWC3_DEVTEN_DISCONNEVTEN);
         dwc3_writel(dwc->regs, DWC3_DEVTEN, reg);
 
-        /* Enable USB2 LPM and automatic phy suspend only on recent versions */
+        /* automatic phy suspend only on recent versions */
         if (dwc->revision >= DWC3_REVISION_194A) {
-                reg = dwc3_readl(dwc->regs, DWC3_DCFG);
-                reg |= DWC3_DCFG_LPM_CAP;
-                dwc3_writel(dwc->regs, DWC3_DCFG, reg);
-
-                reg = dwc3_readl(dwc->regs, DWC3_DCTL);
-                reg &= ~(DWC3_DCTL_HIRD_THRES_MASK | DWC3_DCTL_L1_HIBER_EN);
-
-                /* TODO: This should be configurable */
-                reg |= DWC3_DCTL_HIRD_THRES(28);
-
-                dwc3_writel(dwc->regs, DWC3_DCTL, reg);
-
                 dwc3_gadget_usb2_phy_suspend(dwc, false);
                 dwc3_gadget_usb3_phy_suspend(dwc, false);
         }
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index 56a62342884d..0fa1846eda4c 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -44,7 +44,7 @@ int dwc3_host_init(struct dwc3 *dwc)
         struct platform_device  *xhci;
         int                     ret;
 
-        xhci = platform_device_alloc("xhci-hcd", -1);
+        xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);
         if (!xhci) {
                 dev_err(dwc->dev, "couldn't allocate xHCI device\n");
                 ret = -ENOMEM;
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 14625fd2cecd..c5c6fa60910d 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -281,6 +281,7 @@ config USB_S3C_HSOTG
 config USB_IMX
         tristate "Freescale i.MX1 USB Peripheral Controller"
         depends on ARCH_MXC
+        depends on BROKEN
         help
            Freescale's i.MX1 includes an integrated full speed
            USB 1.1 device controller.
@@ -319,6 +320,7 @@ config USB_S3C_HSUDC
 
 config USB_MV_UDC
         tristate "Marvell USB2.0 Device Controller"
+        depends on GENERIC_HARDIRQS
         help
           Marvell Socs (including PXA and MMP series) include a high speed
           USB2.0 OTG controller, which can be configured as high speed or
@@ -440,7 +442,7 @@ config USB_GOKU
 
 config USB_EG20T
         tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
-        depends on PCI
+        depends on PCI && GENERIC_HARDIRQS
         help
           This is a USB device driver for EG20T PCH.
           EG20T PCH is the platform controller hub that is used in Intel's
@@ -500,6 +502,15 @@ config USB_LIBCOMPOSITE
         tristate
         depends on USB_GADGET
 
+config USB_F_ACM
+        tristate
+
+config USB_F_SS_LB
+        tristate
+
+config USB_U_SERIAL
+        tristate
+
 choice
         tristate "USB Gadget Drivers"
         default USB_ETH
@@ -524,6 +535,7 @@ choice
 config USB_ZERO
         tristate "Gadget Zero (DEVELOPMENT)"
         select USB_LIBCOMPOSITE
+        select USB_F_SS_LB
         help
           Gadget Zero is a two-configuration device.  It either sinks and
           sources bulk data; or it loops back a configurable number of
@@ -750,6 +762,8 @@ config USB_GADGET_TARGET
 
 config USB_G_SERIAL
         tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
+        select USB_U_SERIAL
+        select USB_F_ACM
         select USB_LIBCOMPOSITE
         help
           The Serial Gadget talks to the Linux-USB generic serial driver.
@@ -803,6 +817,8 @@ config USB_CDC_COMPOSITE
         tristate "CDC Composite Device (Ethernet and ACM)"
         depends on NET
         select USB_LIBCOMPOSITE
+        select USB_U_SERIAL
+        select USB_F_ACM
         help
           This driver provides two functions in one configuration:
           a CDC Ethernet (ECM) link, and a CDC ACM (serial port) link.
@@ -818,6 +834,7 @@ config USB_G_NOKIA
         tristate "Nokia composite gadget"
         depends on PHONET
         select USB_LIBCOMPOSITE
+        select USB_U_SERIAL
         help
           The Nokia composite gadget provides support for acm, obex
           and phonet in only one composite gadget driver.
@@ -829,6 +846,8 @@ config USB_G_ACM_MS
         tristate "CDC Composite Device (ACM and mass storage)"
         depends on BLOCK
         select USB_LIBCOMPOSITE
+        select USB_U_SERIAL
+        select USB_F_ACM
         help
           This driver provides two functions in one configuration:
           a mass storage, and a CDC ACM (serial port) link.
@@ -841,6 +860,8 @@ config USB_G_MULTI
         depends on BLOCK && NET
         select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS
         select USB_LIBCOMPOSITE
+        select USB_U_SERIAL
+        select USB_F_ACM
         help
           The Multifunction Composite Gadget provides Ethernet (RNDIS
           and/or CDC Ethernet), mass storage and ACM serial link
@@ -916,6 +937,7 @@ config USB_G_DBGP_PRINTK
 
 config USB_G_DBGP_SERIAL
         depends on USB_G_DBGP
+        select USB_U_SERIAL
         bool "serial"
         help
           Userland can interact using /dev/ttyGSxxx.
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 8b4acfd92aa3..97a13c349cc5 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -6,7 +6,7 @@ ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
 obj-$(CONFIG_USB_GADGET)        += udc-core.o
 obj-$(CONFIG_USB_LIBCOMPOSITE)  += libcomposite.o
 libcomposite-y                  := usbstring.o config.o epautoconf.o
-libcomposite-y                  += composite.o
+libcomposite-y                  += composite.o functions.o
 obj-$(CONFIG_USB_DUMMY_HCD)     += dummy_hcd.o
 obj-$(CONFIG_USB_NET2272)       += net2272.o
 obj-$(CONFIG_USB_NET2280)       += net2280.o
@@ -74,3 +74,9 @@ obj-$(CONFIG_USB_G_WEBCAM)	+= g_webcam.o
 obj-$(CONFIG_USB_G_NCM)         += g_ncm.o
 obj-$(CONFIG_USB_G_ACM_MS)      += g_acm_ms.o
 obj-$(CONFIG_USB_GADGET_TARGET) += tcm_usb_gadget.o
+
+# USB Functions
+obj-$(CONFIG_USB_F_ACM)         += f_acm.o
+f_ss_lb-y                       := f_loopback.o f_sourcesink.o
+obj-$(CONFIG_USB_F_SS_LB)       += f_ss_lb.o
+obj-$(CONFIG_USB_U_SERIAL)      += u_serial.o
diff --git a/drivers/usb/gadget/acm_ms.c b/drivers/usb/gadget/acm_ms.c
index 5a7f289805ff..8f2b0e391534 100644
--- a/drivers/usb/gadget/acm_ms.c
+++ b/drivers/usb/gadget/acm_ms.c
@@ -40,9 +40,6 @@
  * the runtime footprint, and giving us at least some parts of what
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
-
-#include "u_serial.c"
-#include "f_acm.c"
 #include "f_mass_storage.c"
 
 /*-------------------------------------------------------------------------*/
@@ -112,12 +109,15 @@ FSG_MODULE_PARAMETERS(/* no prefix */, fsg_mod_data);
 static struct fsg_common fsg_common;
 
 /*-------------------------------------------------------------------------*/
-
+static unsigned char tty_line;
+static struct usb_function *f_acm;
+static struct usb_function_instance *f_acm_inst;
 /*
  * We _always_ have both ACM and mass storage functions.
  */
 static int __init acm_ms_do_config(struct usb_configuration *c)
 {
+        struct f_serial_opts *opts;
         int     status;
 
         if (gadget_is_otg(c->cdev->gadget)) {
@@ -125,16 +125,35 @@ static int __init acm_ms_do_config(struct usb_configuration *c)
                 c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
         }
 
+        f_acm_inst = usb_get_function_instance("acm");
+        if (IS_ERR(f_acm_inst))
+                return PTR_ERR(f_acm_inst);
+
+        opts = container_of(f_acm_inst, struct f_serial_opts, func_inst);
+        opts->port_num = tty_line;
+
+        f_acm = usb_get_function(f_acm_inst);
+        if (IS_ERR(f_acm)) {
+                status = PTR_ERR(f_acm);
+                goto err_func;
+        }
 
-        status = acm_bind_config(c, 0);
+        status = usb_add_function(c, f_acm);
         if (status < 0)
-                return status;
+                goto err_conf;
 
         status = fsg_bind_config(c->cdev, c, &fsg_common);
         if (status < 0)
-                return status;
+                goto err_fsg;
 
         return 0;
+err_fsg:
+        usb_remove_function(c, f_acm);
+err_conf:
+        usb_put_function(f_acm);
+err_func:
+        usb_put_function_instance(f_acm_inst);
+        return status;
 }
 
 static struct usb_configuration acm_ms_config_driver = {
@@ -153,7 +172,7 @@ static int __init acm_ms_bind(struct usb_composite_dev *cdev)
         void                    *retp;
 
         /* set up serial link layer */
-        status = gserial_setup(cdev->gadget, 1);
+        status = gserial_alloc_line(&tty_line);
         if (status < 0)
                 return status;
 
@@ -189,14 +208,15 @@ static int __init acm_ms_bind(struct usb_composite_dev *cdev)
 fail1:
         fsg_common_put(&fsg_common);
 fail0:
-        gserial_cleanup();
+        gserial_free_line(tty_line);
         return status;
 }
 
 static int __exit acm_ms_unbind(struct usb_composite_dev *cdev)
 {
-        gserial_cleanup();
-
+        usb_put_function(f_acm);
+        usb_put_function_instance(f_acm_inst);
+        gserial_free_line(tty_line);
         return 0;
 }
 
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index d9f6b9372491..75973f33a4c8 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -1400,15 +1400,16 @@ static int udc_wakeup(struct usb_gadget *gadget)
         return 0;
 }
 
-static int amd5536_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int amd5536_stop(struct usb_gadget_driver *driver);
+static int amd5536_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
+static int amd5536_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
 /* gadget operations */
 static const struct usb_gadget_ops udc_ops = {
         .wakeup         = udc_wakeup,
         .get_frame      = udc_get_frame,
-        .start          = amd5536_start,
-        .stop           = amd5536_stop,
+        .udc_start      = amd5536_udc_start,
+        .udc_stop       = amd5536_udc_stop,
 };
 
 /* Setups endpoint parameters, adds endpoints to linked list */
@@ -1913,41 +1914,22 @@ static int setup_ep0(struct udc *dev)
 }
 
 /* Called by gadget driver to register itself */
-static int amd5536_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int amd5536_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct udc              *dev = udc;
-        int                     retval;
+        struct udc *dev = to_amd5536_udc(g);
         u32 tmp;
 
-        if (!driver || !bind || !driver->setup
-                        || driver->max_speed < USB_SPEED_HIGH)
-                return -EINVAL;
-        if (!dev)
-                return -ENODEV;
-        if (dev->driver)
-                return -EBUSY;
-
         driver->driver.bus = NULL;
         dev->driver = driver;
         dev->gadget.dev.driver = &driver->driver;
 
-        retval = bind(&dev->gadget, driver);
-
         /* Some gadget drivers use both ep0 directions.
          * NOTE: to gadget driver, ep0 is just one endpoint...
          */
         dev->ep[UDC_EP0OUT_IX].ep.driver_data =
                 dev->ep[UDC_EP0IN_IX].ep.driver_data;
 
-        if (retval) {
-                DBG(dev, "binding to %s returning %d\n",
-                                driver->driver.name, retval);
-                dev->driver = NULL;
-                dev->gadget.dev.driver = NULL;
-                return retval;
-        }
-
         /* get ready for ep0 traffic */
         setup_ep0(dev);
 
@@ -1969,14 +1951,9 @@ __acquires(dev->lock)
 {
         int tmp;
 
-        if (dev->gadget.speed != USB_SPEED_UNKNOWN) {
-                spin_unlock(&dev->lock);
-                driver->disconnect(&dev->gadget);
-                spin_lock(&dev->lock);
-        }
-
         /* empty queues and init hardware */
         udc_basic_init(dev);
+
         for (tmp = 0; tmp < UDC_EP_NUM; tmp++)
                 empty_req_queue(&dev->ep[tmp]);
 
@@ -1984,23 +1961,18 @@ __acquires(dev->lock)
 }
 
 /* Called by gadget driver to unregister itself */
-static int amd5536_stop(struct usb_gadget_driver *driver)
+static int amd5536_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct udc      *dev = udc;
-        unsigned long   flags;
+        struct udc *dev = to_amd5536_udc(g);
+        unsigned long flags;
         u32 tmp;
 
-        if (!dev)
-                return -ENODEV;
-        if (!driver || driver != dev->driver || !driver->unbind)
-                return -EINVAL;
-
         spin_lock_irqsave(&dev->lock, flags);
         udc_mask_unused_interrupts(dev);
         shutdown(dev, driver);
         spin_unlock_irqrestore(&dev->lock, flags);
 
-        driver->unbind(&dev->gadget);
         dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
 
@@ -2009,9 +1981,6 @@ static int amd5536_stop(struct usb_gadget_driver *driver)
         tmp |= AMD_BIT(UDC_DEVCTL_SD);
         writel(tmp, &dev->regs->ctl);
 
-
-        DBG(dev, "%s: unregistered\n", driver->driver.name);
-
         return 0;
 }
 
diff --git a/drivers/usb/gadget/amd5536udc.h b/drivers/usb/gadget/amd5536udc.h
index 14af87d65caa..f1bf32e6b8d8 100644
--- a/drivers/usb/gadget/amd5536udc.h
+++ b/drivers/usb/gadget/amd5536udc.h
@@ -563,6 +563,8 @@ struct udc {
         u16                             cur_alt;
 };
 
+#define to_amd5536_udc(g)       (container_of((g), struct udc, gadget))
+
 /* setup request data */
 union udc_setup_data {
         u32                     data[2];
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 0143ffa4e409..45dd2929a671 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1621,8 +1621,7 @@ static void at91_vbus_timer(unsigned long data)
          * bus such as i2c or spi which may sleep, so schedule some work
          * to read the vbus gpio
          */
-        if (!work_pending(&udc->vbus_timer_work))
-                schedule_work(&udc->vbus_timer_work);
+        schedule_work(&udc->vbus_timer_work);
 }
 
 static int at91_start(struct usb_gadget *gadget,
@@ -1739,7 +1738,7 @@ static int at91udc_probe(struct platform_device *pdev)
 
         /* rm9200 needs manual D+ pullup; off by default */
         if (cpu_is_at91rm9200()) {
-                if (gpio_is_valid(udc->board.pullup_pin)) {
+                if (!gpio_is_valid(udc->board.pullup_pin)) {
                         DBG("no D+ pullup?\n");
                         retval = -ENODEV;
                         goto fail0;
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index 1e4bb77f00bb..a7d6f7026757 100644
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -42,9 +42,6 @@ USB_GADGET_COMPOSITE_OPTIONS();
  * the runtime footprint, and giving us at least some parts of what
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
-
-#include "u_serial.c"
-#include "f_acm.c"
 #include "f_ecm.c"
 #include "u_ether.c"
 
@@ -108,12 +105,16 @@ static struct usb_gadget_strings *dev_strings[] = {
 static u8 hostaddr[ETH_ALEN];
 
 /*-------------------------------------------------------------------------*/
+static struct usb_function *f_acm;
+static struct usb_function_instance *fi_serial;
 
+static unsigned char tty_line;
 /*
  * We _always_ have both CDC ECM and CDC ACM functions.
  */
 static int __init cdc_do_config(struct usb_configuration *c)
 {
+        struct f_serial_opts *opts;
         int     status;
 
         if (gadget_is_otg(c->cdev->gadget)) {
@@ -125,11 +126,26 @@ static int __init cdc_do_config(struct usb_configuration *c)
         if (status < 0)
                 return status;
 
-        status = acm_bind_config(c, 0);
-        if (status < 0)
-                return status;
+        fi_serial = usb_get_function_instance("acm");
+        if (IS_ERR(fi_serial))
+                return PTR_ERR(fi_serial);
 
+        opts = container_of(fi_serial, struct f_serial_opts, func_inst);
+        opts->port_num = tty_line;
+
+        f_acm = usb_get_function(fi_serial);
+        if (IS_ERR(f_acm))
+                goto err_func_acm;
+
+        status = usb_add_function(c, f_acm);
+        if (status)
+                goto err_conf;
         return 0;
+err_conf:
+        usb_put_function(f_acm);
+err_func_acm:
+        usb_put_function_instance(fi_serial);
+        return status;
 }
 
 static struct usb_configuration cdc_config_driver = {
@@ -158,7 +174,7 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
                 return status;
 
         /* set up serial link layer */
-        status = gserial_setup(cdev->gadget, 1);
+        status = gserial_alloc_line(&tty_line);
         if (status < 0)
                 goto fail0;
 
@@ -184,7 +200,7 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
         return 0;
 
 fail1:
-        gserial_cleanup();
+        gserial_free_line(tty_line);
 fail0:
         gether_cleanup();
         return status;
@@ -192,7 +208,9 @@ fail0:
 
 static int __exit cdc_unbind(struct usb_composite_dev *cdev)
 {
-        gserial_cleanup();
+        usb_put_function(f_acm);
+        usb_put_function_instance(fi_serial);
+        gserial_free_line(tty_line);
         gether_cleanup();
         return 0;
 }
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 2a6bfe759c29..7c821de8ce3d 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -28,6 +28,12 @@
  * with the relevant device-wide data.
  */
 
+static struct usb_gadget_strings **get_containers_gs(
+                struct usb_gadget_string_container *uc)
+{
+        return (struct usb_gadget_strings **)uc->stash;
+}
+
 /**
  * next_ep_desc() - advance to the next EP descriptor
  * @t: currect pointer within descriptor array
@@ -215,6 +221,18 @@ done:
 }
 EXPORT_SYMBOL_GPL(usb_add_function);
 
+void usb_remove_function(struct usb_configuration *c, struct usb_function *f)
+{
+        if (f->disable)
+                f->disable(f);
+
+        bitmap_zero(f->endpoints, 32);
+        list_del(&f->list);
+        if (f->unbind)
+                f->unbind(c, f);
+}
+EXPORT_SYMBOL_GPL(usb_remove_function);
+
 /**
  * usb_function_deactivate - prevent function and gadget enumeration
  * @function: the function that isn't yet ready to respond
@@ -320,6 +338,25 @@ int usb_interface_id(struct usb_configuration *config,
 }
 EXPORT_SYMBOL_GPL(usb_interface_id);
 
+static u8 encode_bMaxPower(enum usb_device_speed speed,
+                struct usb_configuration *c)
+{
+        unsigned val;
+
+        if (c->MaxPower)
+                val = c->MaxPower;
+        else
+                val = CONFIG_USB_GADGET_VBUS_DRAW;
+        if (!val)
+                return 0;
+        switch (speed) {
+        case USB_SPEED_SUPER:
+                return DIV_ROUND_UP(val, 8);
+        default:
+                return DIV_ROUND_UP(val, 2);
+        };
+}
+
 static int config_buf(struct usb_configuration *config,
                 enum usb_device_speed speed, void *buf, u8 type)
 {
@@ -339,7 +376,7 @@ static int config_buf(struct usb_configuration *config,
         c->bConfigurationValue = config->bConfigurationValue;
         c->iConfiguration = config->iConfiguration;
         c->bmAttributes = USB_CONFIG_ATT_ONE | config->bmAttributes;
-        c->bMaxPower = config->bMaxPower ? : (CONFIG_USB_GADGET_VBUS_DRAW / 2);
+        c->bMaxPower = encode_bMaxPower(speed, config);
 
         /* There may be e.g. OTG descriptors */
         if (config->descriptors) {
@@ -656,7 +693,7 @@ static int set_config(struct usb_composite_dev *cdev,
         }
 
         /* when we return, be sure our power usage is valid */
-        power = c->bMaxPower ? (2 * c->bMaxPower) : CONFIG_USB_GADGET_VBUS_DRAW;
+        power = c->MaxPower ? c->MaxPower : CONFIG_USB_GADGET_VBUS_DRAW;
 done:
         usb_gadget_vbus_draw(gadget, power);
         if (result >= 0 && cdev->delayed_status)
@@ -664,6 +701,31 @@ done:
         return result;
 }
 
+int usb_add_config_only(struct usb_composite_dev *cdev,
+                struct usb_configuration *config)
+{
+        struct usb_configuration *c;
+
+        if (!config->bConfigurationValue)
+                return -EINVAL;
+
+        /* Prevent duplicate configuration identifiers */
+        list_for_each_entry(c, &cdev->configs, list) {
+                if (c->bConfigurationValue == config->bConfigurationValue)
+                        return -EBUSY;
+        }
+
+        config->cdev = cdev;
+        list_add_tail(&config->list, &cdev->configs);
+
+        INIT_LIST_HEAD(&config->functions);
+        config->next_interface_id = 0;
+        memset(config->interface, 0, sizeof(config->interface));
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(usb_add_config_only);
+
 /**
  * usb_add_config() - add a configuration to a device.
  * @cdev: wraps the USB gadget
@@ -684,30 +746,18 @@ int usb_add_config(struct usb_composite_dev *cdev,
                 int (*bind)(struct usb_configuration *))
 {
         int                             status = -EINVAL;
-        struct usb_configuration        *c;
+
+        if (!bind)
+                goto done;
 
         DBG(cdev, "adding config #%u '%s'/%p\n",
                         config->bConfigurationValue,
                         config->label, config);
 
-        if (!config->bConfigurationValue || !bind)
+        status = usb_add_config_only(cdev, config);
+        if (status)
                 goto done;
 
-        /* Prevent duplicate configuration identifiers */
-        list_for_each_entry(c, &cdev->configs, list) {
-                if (c->bConfigurationValue == config->bConfigurationValue) {
-                        status = -EBUSY;
-                        goto done;
-                }
-        }
-
-        config->cdev = cdev;
-        list_add_tail(&config->list, &cdev->configs);
-
-        INIT_LIST_HEAD(&config->functions);
-        config->next_interface_id = 0;
-        memset(config->interface, 0, sizeof(config->interface));
-
         status = bind(config);
         if (status < 0) {
                 while (!list_empty(&config->functions)) {
@@ -860,6 +910,7 @@ static int get_string(struct usb_composite_dev *cdev,
                 void *buf, u16 language, int id)
 {
         struct usb_composite_driver     *composite = cdev->driver;
+        struct usb_gadget_string_container *uc;
         struct usb_configuration        *c;
         struct usb_function             *f;
         int                             len;
@@ -892,6 +943,12 @@ static int get_string(struct usb_composite_dev *cdev,
                                         collect_langs(sp, s->wData);
                         }
                 }
+                list_for_each_entry(uc, &cdev->gstrings, list) {
+                        struct usb_gadget_strings **sp;
+
+                        sp = get_containers_gs(uc);
+                        collect_langs(sp, s->wData);
+                }
 
                 for (len = 0; len <= 126 && s->wData[len]; len++)
                         continue;
@@ -902,6 +959,15 @@ static int get_string(struct usb_composite_dev *cdev,
                 return s->bLength;
         }
 
+        list_for_each_entry(uc, &cdev->gstrings, list) {
+                struct usb_gadget_strings **sp;
+
+                sp = get_containers_gs(uc);
+                len = lookup_string(sp, buf, language, id);
+                if (len > 0)
+                        return len;
+        }
+
         /* String IDs are device-scoped, so we look up each string
          * table we're told about.  These lookups are infrequent;
          * simpler-is-better here.
@@ -987,6 +1053,119 @@ int usb_string_ids_tab(struct usb_composite_dev *cdev, struct usb_string *str)
 }
 EXPORT_SYMBOL_GPL(usb_string_ids_tab);
 
+static struct usb_gadget_string_container *copy_gadget_strings(
+                struct usb_gadget_strings **sp, unsigned n_gstrings,
+                unsigned n_strings)
+{
+        struct usb_gadget_string_container *uc;
+        struct usb_gadget_strings **gs_array;
+        struct usb_gadget_strings *gs;
+        struct usb_string *s;
+        unsigned mem;
+        unsigned n_gs;
+        unsigned n_s;
+        void *stash;
+
+        mem = sizeof(*uc);
+        mem += sizeof(void *) * (n_gstrings + 1);
+        mem += sizeof(struct usb_gadget_strings) * n_gstrings;
+        mem += sizeof(struct usb_string) * (n_strings + 1) * (n_gstrings);
+        uc = kmalloc(mem, GFP_KERNEL);
+        if (!uc)
+                return ERR_PTR(-ENOMEM);
+        gs_array = get_containers_gs(uc);
+        stash = uc->stash;
+        stash += sizeof(void *) * (n_gstrings + 1);
+        for (n_gs = 0; n_gs < n_gstrings; n_gs++) {
+                struct usb_string *org_s;
+
+                gs_array[n_gs] = stash;
+                gs = gs_array[n_gs];
+                stash += sizeof(struct usb_gadget_strings);
+                gs->language = sp[n_gs]->language;
+                gs->strings = stash;
+                org_s = sp[n_gs]->strings;
+
+                for (n_s = 0; n_s < n_strings; n_s++) {
+                        s = stash;
+                        stash += sizeof(struct usb_string);
+                        if (org_s->s)
+                                s->s = org_s->s;
+                        else
+                                s->s = "";
+                        org_s++;
+                }
+                s = stash;
+                s->s = NULL;
+                stash += sizeof(struct usb_string);
+
+        }
+        gs_array[n_gs] = NULL;
+        return uc;
+}
+
+/**
+ * usb_gstrings_attach() - attach gadget strings to a cdev and assign ids
+ * @cdev: the device whose string descriptor IDs are being allocated
+ * and attached.
+ * @sp: an array of usb_gadget_strings to attach.
+ * @n_strings: number of entries in each usb_strings array (sp[]->strings)
+ *
+ * This function will create a deep copy of usb_gadget_strings and usb_string
+ * and attach it to the cdev. The actual string (usb_string.s) will not be
+ * copied but only a referenced will be made. The struct usb_gadget_strings
+ * array may contain multiple languges and should be NULL terminated.
+ * The ->language pointer of each struct usb_gadget_strings has to contain the
+ * same amount of entries.
+ * For instance: sp[0] is en-US, sp[1] is es-ES. It is expected that the first
+ * usb_string entry of es-ES containts the translation of the first usb_string
+ * entry of en-US. Therefore both entries become the same id assign.
+ */
+struct usb_string *usb_gstrings_attach(struct usb_composite_dev *cdev,
+                struct usb_gadget_strings **sp, unsigned n_strings)
+{
+        struct usb_gadget_string_container *uc;
+        struct usb_gadget_strings **n_gs;
+        unsigned n_gstrings = 0;
+        unsigned i;
+        int ret;
+
+        for (i = 0; sp[i]; i++)
+                n_gstrings++;
+
+        if (!n_gstrings)
+                return ERR_PTR(-EINVAL);
+
+        uc = copy_gadget_strings(sp, n_gstrings, n_strings);
+        if (IS_ERR(uc))
+                return ERR_PTR(PTR_ERR(uc));
+
+        n_gs = get_containers_gs(uc);
+        ret = usb_string_ids_tab(cdev, n_gs[0]->strings);
+        if (ret)
+                goto err;
+
+        for (i = 1; i < n_gstrings; i++) {
+                struct usb_string *m_s;
+                struct usb_string *s;
+                unsigned n;
+
+                m_s = n_gs[0]->strings;
+                s = n_gs[i]->strings;
+                for (n = 0; n < n_strings; n++) {
+                        s->id = m_s->id;
+                        s++;
+                        m_s++;
+                }
+        }
+        list_add_tail(&uc->list, &cdev->gstrings);
+        return n_gs[0]->strings;
+err:
+        kfree(uc);
+        return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(usb_gstrings_attach);
+
 /**
  * usb_string_ids_n() - allocate unused string IDs in batch
  * @c: the device whose string descriptor IDs are being allocated
@@ -1033,7 +1212,7 @@ static void composite_setup_complete(struct usb_ep *ep, struct usb_request *req)
  * housekeeping for the gadget function we're implementing.  Most of
  * the work is in config and function specific setup.
  */
-static int
+int
 composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 {
         struct usb_composite_dev        *cdev = get_gadget_data(gadget);
@@ -1300,7 +1479,7 @@ done:
         return value;
 }
 
-static void composite_disconnect(struct usb_gadget *gadget)
+void composite_disconnect(struct usb_gadget *gadget)
 {
         struct usb_composite_dev        *cdev = get_gadget_data(gadget);
         unsigned long                   flags;
@@ -1330,8 +1509,7 @@ static ssize_t composite_show_suspended(struct device *dev,
 
 static DEVICE_ATTR(suspended, 0444, composite_show_suspended, NULL);
 
-static void
-composite_unbind(struct usb_gadget *gadget)
+static void __composite_unbind(struct usb_gadget *gadget, bool unbind_driver)
 {
         struct usb_composite_dev        *cdev = get_gadget_data(gadget);
 
@@ -1348,19 +1526,21 @@ composite_unbind(struct usb_gadget *gadget)
                                 struct usb_configuration, list);
                 remove_config(cdev, c);
         }
-        if (cdev->driver->unbind)
+        if (cdev->driver->unbind && unbind_driver)
                 cdev->driver->unbind(cdev);
 
-        if (cdev->req) {
-                kfree(cdev->req->buf);
-                usb_ep_free_request(gadget->ep0, cdev->req);
-        }
-        device_remove_file(&gadget->dev, &dev_attr_suspended);
+        composite_dev_cleanup(cdev);
+
         kfree(cdev->def_manufacturer);
         kfree(cdev);
         set_gadget_data(gadget, NULL);
 }
 
+static void composite_unbind(struct usb_gadget *gadget)
+{
+        __composite_unbind(gadget, true);
+}
+
 static void update_unchanged_dev_desc(struct usb_device_descriptor *new,
                 const struct usb_device_descriptor *old)
 {
@@ -1399,34 +1579,25 @@ static void update_unchanged_dev_desc(struct usb_device_descriptor *new,
                 new->iProduct = iProduct;
 }
 
-static struct usb_composite_driver *to_cdriver(struct usb_gadget_driver *gdrv)
-{
-        return container_of(gdrv, struct usb_composite_driver, gadget_driver);
-}
-
-static int composite_bind(struct usb_gadget *gadget,
-                struct usb_gadget_driver *gdriver)
+int composite_dev_prepare(struct usb_composite_driver *composite,
+                struct usb_composite_dev *cdev)
 {
-        struct usb_composite_dev        *cdev;
-        struct usb_composite_driver     *composite = to_cdriver(gdriver);
-        int                             status = -ENOMEM;
-
-        cdev = kzalloc(sizeof *cdev, GFP_KERNEL);
-        if (!cdev)
-                return status;
-
-        spin_lock_init(&cdev->lock);
-        cdev->gadget = gadget;
-        set_gadget_data(gadget, cdev);
-        INIT_LIST_HEAD(&cdev->configs);
+        struct usb_gadget *gadget = cdev->gadget;
+        int ret = -ENOMEM;
 
         /* preallocate control response and buffer */
         cdev->req = usb_ep_alloc_request(gadget->ep0, GFP_KERNEL);
         if (!cdev->req)
-                goto fail;
+                return -ENOMEM;
+
         cdev->req->buf = kmalloc(USB_COMP_EP0_BUFSIZ, GFP_KERNEL);
         if (!cdev->req->buf)
                 goto fail;
+
+        ret = device_create_file(&gadget->dev, &dev_attr_suspended);
+        if (ret)
+                goto fail_dev;
+
         cdev->req->complete = composite_setup_complete;
         gadget->ep0->driver_data = cdev;
 
@@ -1444,7 +1615,51 @@ static int composite_bind(struct usb_gadget *gadget,
          * we force endpoints to start unassigned; few controller
          * drivers will zero ep->driver_data.
          */
-        usb_ep_autoconfig_reset(cdev->gadget);
+        usb_ep_autoconfig_reset(gadget);
+        return 0;
+fail_dev:
+        kfree(cdev->req->buf);
+fail:
+        usb_ep_free_request(gadget->ep0, cdev->req);
+        cdev->req = NULL;
+        return ret;
+}
+
+void composite_dev_cleanup(struct usb_composite_dev *cdev)
+{
+        struct usb_gadget_string_container *uc, *tmp;
+
+        list_for_each_entry_safe(uc, tmp, &cdev->gstrings, list) {
+                list_del(&uc->list);
+                kfree(uc);
+        }
+        if (cdev->req) {
+                kfree(cdev->req->buf);
+                usb_ep_free_request(cdev->gadget->ep0, cdev->req);
+        }
+        device_remove_file(&cdev->gadget->dev, &dev_attr_suspended);
+}
+
+static int composite_bind(struct usb_gadget *gadget,
+                struct usb_gadget_driver *gdriver)
+{
+        struct usb_composite_dev        *cdev;
+        struct usb_composite_driver     *composite = to_cdriver(gdriver);
+        int                             status = -ENOMEM;
+
+        cdev = kzalloc(sizeof *cdev, GFP_KERNEL);
+        if (!cdev)
+                return status;
+
+        spin_lock_init(&cdev->lock);
+        cdev->gadget = gadget;
+        set_gadget_data(gadget, cdev);
+        INIT_LIST_HEAD(&cdev->configs);
+        INIT_LIST_HEAD(&cdev->gstrings);
+
+        status = composite_dev_prepare(composite, cdev);
+        if (status)
+                goto fail;
 
         /* composite gadget needs to assign strings for whole device (like
          * serial number), register function drivers, potentially update
@@ -1460,16 +1675,11 @@ static int composite_bind(struct usb_gadget *gadget,
         if (composite->needs_serial && !cdev->desc.iSerialNumber)
                 WARNING(cdev, "userspace failed to provide iSerialNumber\n");
 
-        /* finish up */
-        status = device_create_file(&gadget->dev, &dev_attr_suspended);
-        if (status)
-                goto fail;
-
         INFO(cdev, "%s ready\n", composite->name);
         return 0;
 
 fail:
-        composite_unbind(gadget);
+        __composite_unbind(gadget, false);
         return status;
 }
 
@@ -1518,10 +1728,10 @@ composite_resume(struct usb_gadget *gadget)
                                 f->resume(f);
                 }
 
-                maxpower = cdev->config->bMaxPower;
+                maxpower = cdev->config->MaxPower;
 
                 usb_gadget_vbus_draw(gadget, maxpower ?
-                        (2 * maxpower) : CONFIG_USB_GADGET_VBUS_DRAW);
+                        maxpower : CONFIG_USB_GADGET_VBUS_DRAW);
         }
 
         cdev->suspended = 0;
diff --git a/drivers/usb/gadget/dbgp.c b/drivers/usb/gadget/dbgp.c
index 87d165028162..986fc511a2ed 100644
--- a/drivers/usb/gadget/dbgp.c
+++ b/drivers/usb/gadget/dbgp.c
@@ -13,9 +13,7 @@
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
-#ifdef CONFIG_USB_G_DBGP_SERIAL
-#include "u_serial.c"
-#endif
+#include "u_serial.h"
 
 #define DRIVER_VENDOR_ID        0x0525 /* NetChip */
 #define DRIVER_PRODUCT_ID       0xc0de /* undefined */
@@ -233,6 +231,10 @@ static void dbgp_unbind(struct usb_gadget *gadget)
         gadget->ep0->driver_data = NULL;
 }
 
+#ifdef CONFIG_USB_G_DBGP_SERIAL
+static unsigned char tty_line;
+#endif
+
 static int __init dbgp_configure_endpoints(struct usb_gadget *gadget)
 {
         int stp;
@@ -270,7 +272,7 @@ static int __init dbgp_configure_endpoints(struct usb_gadget *gadget)
         dbgp.serial->in->desc = &i_desc;
         dbgp.serial->out->desc = &o_desc;
 
-        if (gserial_setup(gadget, 1) < 0) {
+        if (gserial_alloc_line(&tty_line)) {
                 stp = 3;
                 goto fail_3;
         }
@@ -379,7 +381,7 @@ static int dbgp_setup(struct usb_gadget *gadget,
 #ifdef CONFIG_USB_G_DBGP_PRINTK
                 err = dbgp_enable_ep();
 #else
-                err = gserial_connect(dbgp.serial, 0);
+                err = gserial_connect(dbgp.serial, tty_line);
 #endif
                 if (err < 0)
                         goto fail;
@@ -422,7 +424,7 @@ static void __exit dbgp_exit(void)
 {
         usb_gadget_unregister_driver(&dbgp_driver);
 #ifdef CONFIG_USB_G_DBGP_SERIAL
-        gserial_cleanup();
+        gserial_free_line(tty_line);
 #endif
 }
 
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c
index 549174466c21..1ae180baa597 100644
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/f_acm.c
@@ -16,7 +16,9 @@
 
 #include <linux/slab.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/device.h>
+#include <linux/err.h>
 
 #include "u_serial.h"
 #include "gadget_chips.h"
@@ -283,7 +285,6 @@ static struct usb_string acm_string_defs[] = {
         [ACM_CTRL_IDX].s = "CDC Abstract Control Model (ACM)",
         [ACM_DATA_IDX].s = "CDC ACM Data",
         [ACM_IAD_IDX ].s = "CDC Serial",
-        {  /* ZEROES END LIST */ },
 };
 
 static struct usb_gadget_strings acm_string_table = {
@@ -605,9 +606,23 @@ acm_bind(struct usb_configuration *c, struct usb_function *f)
 {
         struct usb_composite_dev *cdev = c->cdev;
         struct f_acm            *acm = func_to_acm(f);
+        struct usb_string       *us;
         int                     status;
         struct usb_ep           *ep;
 
+        /* REVISIT might want instance-specific strings to help
+         * distinguish instances ...
+         */
+
+        /* maybe allocate device-global string IDs, and patch descriptors */
+        us = usb_gstrings_attach(cdev, acm_strings,
+                        ARRAY_SIZE(acm_string_defs));
+        if (IS_ERR(us))
+                return PTR_ERR(us);
+        acm_control_interface_desc.iInterface = us[ACM_CTRL_IDX].id;
+        acm_data_interface_desc.iInterface = us[ACM_DATA_IDX].id;
+        acm_iad_descriptor.iFunction = us[ACM_IAD_IDX].id;
+
         /* allocate instance-specific interface IDs, and patch descriptors */
         status = usb_interface_id(c, f);
         if (status < 0)
@@ -700,24 +715,42 @@ fail:
         return status;
 }
 
+static struct f_acm *acm_alloc_basic_func(void)
+{
+        struct f_acm    *acm;
+
+        acm = kzalloc(sizeof(*acm), GFP_KERNEL);
+        if (!acm)
+                return NULL;
+
+        spin_lock_init(&acm->lock);
+
+        acm->port.connect = acm_connect;
+        acm->port.disconnect = acm_disconnect;
+        acm->port.send_break = acm_send_break;
+
+        acm->port.func.name = "acm";
+        /* descriptors are per-instance copies */
+        acm->port.func.bind = acm_bind;
+        acm->port.func.set_alt = acm_set_alt;
+        acm->port.func.setup = acm_setup;
+        acm->port.func.disable = acm_disable;
+
+        return acm;
+}
+
+#ifdef USB_FACM_INCLUDED
 static void
-acm_unbind(struct usb_configuration *c, struct usb_function *f)
+acm_old_unbind(struct usb_configuration *c, struct usb_function *f)
 {
         struct f_acm            *acm = func_to_acm(f);
 
-        acm_string_defs[0].id = 0;
         usb_free_all_descriptors(f);
-        gs_free_req(acm->notify, acm->notify_req);
+        if (acm->notify_req)
+                gs_free_req(acm->notify, acm->notify_req);
         kfree(acm);
 }
 
-/* Some controllers can't support CDC ACM ... */
-static inline bool can_support_cdc(struct usb_configuration *c)
-{
-        /* everything else is *probably* fine ... */
-        return true;
-}
-
 /**
  * acm_bind_config - add a CDC ACM function to a configuration
  * @c: the configuration to support the CDC ACM instance
@@ -726,58 +759,80 @@ static inline bool can_support_cdc(struct usb_configuration *c)
  *
  * Returns zero on success, else negative errno.
  *
- * Caller must have called @gserial_setup() with enough ports to
- * handle all the ones it binds.  Caller is also responsible
- * for calling @gserial_cleanup() before module unload.
  */
 int acm_bind_config(struct usb_configuration *c, u8 port_num)
 {
         struct f_acm    *acm;
         int             status;
 
-        if (!can_support_cdc(c))
-                return -EINVAL;
-
-        /* REVISIT might want instance-specific strings to help
-         * distinguish instances ...
-         */
-
-        /* maybe allocate device-global string IDs, and patch descriptors */
-        if (acm_string_defs[0].id == 0) {
-                status = usb_string_ids_tab(c->cdev, acm_string_defs);
-                if (status < 0)
-                        return status;
-                acm_control_interface_desc.iInterface =
-                        acm_string_defs[ACM_CTRL_IDX].id;
-                acm_data_interface_desc.iInterface =
-                        acm_string_defs[ACM_DATA_IDX].id;
-                acm_iad_descriptor.iFunction = acm_string_defs[ACM_IAD_IDX].id;
-        }
-
         /* allocate and initialize one new instance */
-        acm = kzalloc(sizeof *acm, GFP_KERNEL);
+        acm = acm_alloc_basic_func();
         if (!acm)
                 return -ENOMEM;
 
-        spin_lock_init(&acm->lock);
-
         acm->port_num = port_num;
-
-        acm->port.connect = acm_connect;
-        acm->port.disconnect = acm_disconnect;
-        acm->port.send_break = acm_send_break;
-
-        acm->port.func.name = "acm";
-        acm->port.func.strings = acm_strings;
-        /* descriptors are per-instance copies */
-        acm->port.func.bind = acm_bind;
-        acm->port.func.unbind = acm_unbind;
-        acm->port.func.set_alt = acm_set_alt;
-        acm->port.func.setup = acm_setup;
-        acm->port.func.disable = acm_disable;
+        acm->port.func.unbind = acm_old_unbind;
 
         status = usb_add_function(c, &acm->port.func);
         if (status)
                 kfree(acm);
         return status;
 }
+
+#else
+
+static void acm_unbind(struct usb_configuration *c, struct usb_function *f)
+{
+        struct f_acm            *acm = func_to_acm(f);
+
+        acm_string_defs[0].id = 0;
+        usb_free_all_descriptors(f);
+        if (acm->notify_req)
+                gs_free_req(acm->notify, acm->notify_req);
+}
+
+static void acm_free_func(struct usb_function *f)
+{
+        struct f_acm            *acm = func_to_acm(f);
+
+        kfree(acm);
+}
+
+static struct usb_function *acm_alloc_func(struct usb_function_instance *fi)
+{
+        struct f_serial_opts *opts;
+        struct f_acm *acm;
+
+        acm = acm_alloc_basic_func();
+        if (!acm)
+                return ERR_PTR(-ENOMEM);
+
+        opts = container_of(fi, struct f_serial_opts, func_inst);
+        acm->port_num = opts->port_num;
+        acm->port.func.unbind = acm_unbind;
+        acm->port.func.free_func = acm_free_func;
+
+        return &acm->port.func;
+}
+
+static void acm_free_instance(struct usb_function_instance *fi)
+{
+        struct f_serial_opts *opts;
+
+        opts = container_of(fi, struct f_serial_opts, func_inst);
+        kfree(opts);
+}
+
+static struct usb_function_instance *acm_alloc_instance(void)
+{
+        struct f_serial_opts *opts;
+
+        opts = kzalloc(sizeof(*opts), GFP_KERNEL);
+        if (!opts)
+                return ERR_PTR(-ENOMEM);
+        opts->func_inst.free_func_inst = acm_free_instance;
+        return &opts->func_inst;
+}
+DECLARE_USB_FUNCTION_INIT(acm, acm_alloc_instance, acm_alloc_func);
+MODULE_LICENSE("GPL");
+#endif
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 8c2f25121149..38388d7844fc 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1103,8 +1103,8 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data *data, char *opts)
                 return 0;
 
         for (;;) {
-                char *end, *eq, *comma;
                 unsigned long value;
+                char *eq, *comma;
 
                 /* Option limit */
                 comma = strchr(opts, ',');
@@ -1120,8 +1120,7 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data *data, char *opts)
                 *eq = 0;
 
                 /* Parse value */
-                value = simple_strtoul(eq + 1, &end, 0);
-                if (unlikely(*end != ',' && *end != 0)) {
+                if (kstrtoul(eq + 1, 0, &value)) {
                         pr_err("%s: invalid value: %s\n", opts, eq + 1);
                         return -EINVAL;
                 }
diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c
index bb39cb2bb3a3..4a3873a0f2d0 100644
--- a/drivers/usb/gadget/f_loopback.c
+++ b/drivers/usb/gadget/f_loopback.c
@@ -15,10 +15,11 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/usb/composite.h>
 
 #include "g_zero.h"
-#include "gadget_chips.h"
-
 
 /*
  * LOOPBACK FUNCTION ... a testing vehicle for USB peripherals,
@@ -44,9 +45,8 @@ static inline struct f_loopback *func_to_loop(struct usb_function *f)
         return container_of(f, struct f_loopback, function);
 }
 
-static unsigned qlen = 32;
-module_param(qlen, uint, 0);
-MODULE_PARM_DESC(qlenn, "depth of loopback queue");
+static unsigned qlen;
+static unsigned buflen;
 
 /*-------------------------------------------------------------------------*/
 
@@ -171,8 +171,7 @@ static struct usb_gadget_strings *loopback_strings[] = {
 
 /*-------------------------------------------------------------------------*/
 
-static int __init
-loopback_bind(struct usb_configuration *c, struct usb_function *f)
+static int loopback_bind(struct usb_configuration *c, struct usb_function *f)
 {
         struct usb_composite_dev *cdev = c->cdev;
         struct f_loopback       *loop = func_to_loop(f);
@@ -185,6 +184,12 @@ loopback_bind(struct usb_configuration *c, struct usb_function *f)
                 return id;
         loopback_intf.bInterfaceNumber = id;
 
+        id = usb_string_id(cdev);
+        if (id < 0)
+                return id;
+        strings_loopback[0].id = id;
+        loopback_intf.iInterface = id;
+
         /* allocate endpoints */
 
         loop->in_ep = usb_ep_autoconfig(cdev->gadget, &fs_loop_source_desc);
@@ -223,8 +228,7 @@ autoconf_fail:
         return 0;
 }
 
-static void
-loopback_unbind(struct usb_configuration *c, struct usb_function *f)
+static void lb_free_func(struct usb_function *f)
 {
         usb_free_all_descriptors(f);
         kfree(func_to_loop(f));
@@ -366,63 +370,64 @@ static void loopback_disable(struct usb_function *f)
         disable_loopback(loop);
 }
 
-/*-------------------------------------------------------------------------*/
-
-static int __init loopback_bind_config(struct usb_configuration *c)
+static struct usb_function *loopback_alloc(struct usb_function_instance *fi)
 {
         struct f_loopback       *loop;
-        int                     status;
+        struct f_lb_opts        *lb_opts;
 
         loop = kzalloc(sizeof *loop, GFP_KERNEL);
         if (!loop)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
+
+        lb_opts = container_of(fi, struct f_lb_opts, func_inst);
+        buflen = lb_opts->bulk_buflen;
+        qlen = lb_opts->qlen;
+        if (!qlen)
+                qlen = 32;
 
         loop->function.name = "loopback";
         loop->function.bind = loopback_bind;
-        loop->function.unbind = loopback_unbind;
         loop->function.set_alt = loopback_set_alt;
         loop->function.disable = loopback_disable;
+        loop->function.strings = loopback_strings;
 
-        status = usb_add_function(c, &loop->function);
-        if (status)
-                kfree(loop);
-        return status;
-}
+        loop->function.free_func = lb_free_func;
 
-static struct usb_configuration loopback_driver = {
-        .label          = "loopback",
-        .strings        = loopback_strings,
-        .bConfigurationValue = 2,
-        .bmAttributes   = USB_CONFIG_ATT_SELFPOWER,
-        /* .iConfiguration = DYNAMIC */
-};
+        return &loop->function;
+}
 
-/**
- * loopback_add - add a loopback testing configuration to a device
- * @cdev: the device to support the loopback configuration
- */
-int __init loopback_add(struct usb_composite_dev *cdev, bool autoresume)
+static void lb_free_instance(struct usb_function_instance *fi)
 {
-        int id;
+        struct f_lb_opts *lb_opts;
 
-        /* allocate string ID(s) */
-        id = usb_string_id(cdev);
-        if (id < 0)
-                return id;
-        strings_loopback[0].id = id;
+        lb_opts = container_of(fi, struct f_lb_opts, func_inst);
+        kfree(lb_opts);
+}
 
-        loopback_intf.iInterface = id;
-        loopback_driver.iConfiguration = id;
+static struct usb_function_instance *loopback_alloc_instance(void)
+{
+        struct f_lb_opts *lb_opts;
 
-        /* support autoresume for remote wakeup testing */
-        if (autoresume)
-                loopback_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+        lb_opts = kzalloc(sizeof(*lb_opts), GFP_KERNEL);
+        if (!lb_opts)
+                return ERR_PTR(-ENOMEM);
+        lb_opts->func_inst.free_func_inst = lb_free_instance;
+        return  &lb_opts->func_inst;
+}
+DECLARE_USB_FUNCTION(Loopback, loopback_alloc_instance, loopback_alloc);
 
-        /* support OTG systems */
-        if (gadget_is_otg(cdev->gadget)) {
-                loopback_driver.descriptors = otg_desc;
-                loopback_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
-        }
+int __init lb_modinit(void)
+{
+        int ret;
 
-        return usb_add_config(cdev, &loopback_driver, loopback_bind_config);
+        ret = usb_function_register(&Loopbackusb_func);
+        if (ret)
+                return ret;
+        return ret;
 }
+void __exit lb_modexit(void)
+{
+        usb_function_unregister(&Loopbackusb_func);
+}
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 5d027b3e1ef0..fc5c16ca5e0a 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -246,20 +246,6 @@ struct fsg_operations {
          * set).
          */
         int (*thread_exits)(struct fsg_common *common);
-
-        /*
-         * Called prior to ejection.  Negative return means error,
-         * zero means to continue with ejection, positive means not to
-         * eject.
-         */
-        int (*pre_eject)(struct fsg_common *common,
-                         struct fsg_lun *lun, int num);
-        /*
-         * Called after ejection.  Negative return means error, zero
-         * or positive is just a success.
-         */
-        int (*post_eject)(struct fsg_common *common,
-                          struct fsg_lun *lun, int num);
 };
 
 /* Data shared by all the FSG instances. */
@@ -1374,26 +1360,13 @@ static int do_start_stop(struct fsg_common *common)
         if (!loej)
                 return 0;
 
-        /* Simulate an unload/eject */
-        if (common->ops && common->ops->pre_eject) {
-                int r = common->ops->pre_eject(common, curlun,
-                                               curlun - common->luns);
-                if (unlikely(r < 0))
-                        return r;
-                else if (r)
-                        return 0;
-        }
-
         up_read(&common->filesem);
         down_write(&common->filesem);
         fsg_lun_close(curlun);
         up_write(&common->filesem);
         down_read(&common->filesem);
 
-        return common->ops && common->ops->post_eject
-                ? min(0, common->ops->post_eject(common, curlun,
-                                                 curlun - common->luns))
-                : 0;
+        return 0;
 }
 
 static int do_prevent_allow(struct fsg_common *common)
@@ -1718,7 +1691,7 @@ static int check_command(struct fsg_common *common, int cmnd_size,
                          int needs_medium, const char *name)
 {
         int                     i;
-        int                     lun = common->cmnd[1] >> 5;
+        unsigned int            lun = common->cmnd[1] >> 5;
         static const char       dirletter[4] = {'u', 'o', 'i', 'n'};
         char                    hdlen[20];
         struct fsg_lun          *curlun;
@@ -1784,7 +1757,7 @@ static int check_command(struct fsg_common *common, int cmnd_size,
 
         /* Check that the LUN values are consistent */
         if (common->lun != lun)
-                DBG(common, "using LUN %d from CBW, not LUN %d from CDB\n",
+                DBG(common, "using LUN %u from CBW, not LUN %u from CDB\n",
                     common->lun, lun);
 
         /* Check the LUN */
@@ -1804,7 +1777,7 @@ static int check_command(struct fsg_common *common, int cmnd_size,
                  */
                 if (common->cmnd[0] != INQUIRY &&
                     common->cmnd[0] != REQUEST_SENSE) {
-                        DBG(common, "unsupported LUN %d\n", common->lun);
+                        DBG(common, "unsupported LUN %u\n", common->lun);
                         return -EINVAL;
                 }
         }
@@ -2196,7 +2169,7 @@ static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
         if (common->data_size == 0)
                 common->data_dir = DATA_DIR_NONE;
         common->lun = cbw->Lun;
-        if (common->lun >= 0 && common->lun < common->nluns)
+        if (common->lun < common->nluns)
                 common->curlun = &common->luns[common->lun];
         else
                 common->curlun = NULL;
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index 6c8362f937be..5e7557e23ecc 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -56,8 +56,9 @@ struct f_ncm {
         u8                              notify_state;
         bool                            is_open;
 
-        struct ndp_parser_opts          *parser_opts;
+        const struct ndp_parser_opts    *parser_opts;
         bool                            is_crc;
+        u32                             ndp_sign;
 
         /*
          * for notification, it is accessed from both
@@ -390,8 +391,8 @@ struct ndp_parser_opts {
                 .next_fp_index = 2,                             \
         }
 
-static struct ndp_parser_opts ndp16_opts = INIT_NDP16_OPTS;
-static struct ndp_parser_opts ndp32_opts = INIT_NDP32_OPTS;
+static const struct ndp_parser_opts ndp16_opts = INIT_NDP16_OPTS;
+static const struct ndp_parser_opts ndp32_opts = INIT_NDP32_OPTS;
 
 static inline void put_ncm(__le16 **p, unsigned size, unsigned val)
 {
@@ -732,8 +733,7 @@ static int ncm_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
                 default:
                         goto invalid;
                 }
-                ncm->parser_opts->ndp_sign &= ~NCM_NDP_HDR_CRC_MASK;
-                ncm->parser_opts->ndp_sign |= ndp_hdr_crc;
+                ncm->ndp_sign = ncm->parser_opts->ndp_sign | ndp_hdr_crc;
                 value = 0;
                 break;
         }
@@ -875,7 +875,7 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
         int             ndp_align;
         int             ndp_pad;
         unsigned        max_size = ncm->port.fixed_in_len;
-        struct ndp_parser_opts *opts = ncm->parser_opts;
+        const struct ndp_parser_opts *opts = ncm->parser_opts;
         unsigned        crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
 
         div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
@@ -921,7 +921,7 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
         tmp = (void *)tmp + ndp_pad;
 
         /* NDP */
-        put_unaligned_le32(opts->ndp_sign, tmp); /* dwSignature */
+        put_unaligned_le32(ncm->ndp_sign, tmp); /* dwSignature */
         tmp += 2;
         /* wLength */
         put_unaligned_le16(ncb_len - opts->nth_size - pad, tmp++);
@@ -965,7 +965,7 @@ static int ncm_unwrap_ntb(struct gether *port,
         struct sk_buff  *skb2;
         int             ret = -EINVAL;
         unsigned        max_size = le32_to_cpu(ntb_parameters.dwNtbOutMaxSize);
-        struct ndp_parser_opts *opts = ncm->parser_opts;
+        const struct ndp_parser_opts *opts = ncm->parser_opts;
         unsigned        crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
         int             dgram_counter;
 
@@ -1002,7 +1002,7 @@ static int ncm_unwrap_ntb(struct gether *port,
 
         /* walk through NDP */
         tmp = ((void *)skb->data) + index;
-        if (get_unaligned_le32(tmp) != opts->ndp_sign) {
+        if (get_unaligned_le32(tmp) != ncm->ndp_sign) {
                 INFO(port->func.config->cdev, "Wrong NDP SIGN\n");
                 goto err;
         }
diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c
index d8dd8782768c..36a004563b82 100644
--- a/drivers/usb/gadget/f_obex.c
+++ b/drivers/usb/gadget/f_obex.c
@@ -406,10 +406,6 @@ static inline bool can_support_obex(struct usb_configuration *c)
  * Context: single threaded during gadget setup
  *
  * Returns zero on success, else negative errno.
- *
- * Caller must have called @gserial_setup() with enough ports to
- * handle all the ones it binds.  Caller is also responsible
- * for calling @gserial_cleanup() before module unload.
  */
 int __init obex_bind_config(struct usb_configuration *c, u8 port_num)
 {
diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c
index 98fa7795df5f..da33cfb3031d 100644
--- a/drivers/usb/gadget/f_serial.c
+++ b/drivers/usb/gadget/f_serial.c
@@ -260,10 +260,6 @@ gser_unbind(struct usb_configuration *c, struct usb_function *f)
  * Context: single threaded during gadget setup
  *
  * Returns zero on success, else negative errno.
- *
- * Caller must have called @gserial_setup() with enough ports to
- * handle all the ones it binds.  Caller is also responsible
- * for calling @gserial_cleanup() before module unload.
  */
 int __init gser_bind_config(struct usb_configuration *c, u8 port_num)
 {
diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/f_sourcesink.c
index 102d49beb9df..41adf3ef96c2 100644
--- a/drivers/usb/gadget/f_sourcesink.c
+++ b/drivers/usb/gadget/f_sourcesink.c
@@ -16,11 +16,12 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/module.h>
+#include <linux/usb/composite.h>
+#include <linux/err.h>
 
 #include "g_zero.h"
 #include "gadget_chips.h"
 
-
 /*
  * SOURCE/SINK FUNCTION ... a primary testing vehicle for USB peripheral
  * controller drivers.
@@ -62,24 +63,11 @@ static inline struct f_sourcesink *func_to_ss(struct usb_function *f)
 }
 
 static unsigned pattern;
-module_param(pattern, uint, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(pattern, "0 = all zeroes, 1 = mod63, 2 = none");
-
-static unsigned isoc_interval = 4;
-module_param(isoc_interval, uint, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(isoc_interval, "1 - 16");
-
-static unsigned isoc_maxpacket = 1024;
-module_param(isoc_maxpacket, uint, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(isoc_maxpacket, "0 - 1023 (fs), 0 - 1024 (hs/ss)");
-
+static unsigned isoc_interval;
+static unsigned isoc_maxpacket;
 static unsigned isoc_mult;
-module_param(isoc_mult, uint, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(isoc_mult, "0 - 2 (hs/ss only)");
-
 static unsigned isoc_maxburst;
-module_param(isoc_maxburst, uint, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(isoc_maxburst, "0 - 15 (ss only)");
+static unsigned buflen;
 
 /*-------------------------------------------------------------------------*/
 
@@ -313,7 +301,57 @@ static struct usb_gadget_strings *sourcesink_strings[] = {
 
 /*-------------------------------------------------------------------------*/
 
-static int __init
+struct usb_request *alloc_ep_req(struct usb_ep *ep, int len)
+{
+        struct usb_request      *req;
+
+        req = usb_ep_alloc_request(ep, GFP_ATOMIC);
+        if (req) {
+                if (len)
+                        req->length = len;
+                else
+                        req->length = buflen;
+                req->buf = kmalloc(req->length, GFP_ATOMIC);
+                if (!req->buf) {
+                        usb_ep_free_request(ep, req);
+                        req = NULL;
+                }
+        }
+        return req;
+}
+
+void free_ep_req(struct usb_ep *ep, struct usb_request *req)
+{
+        kfree(req->buf);
+        usb_ep_free_request(ep, req);
+}
+
+static void disable_ep(struct usb_composite_dev *cdev, struct usb_ep *ep)
+{
+        int                     value;
+
+        if (ep->driver_data) {
+                value = usb_ep_disable(ep);
+                if (value < 0)
+                        DBG(cdev, "disable %s --> %d\n",
+                                        ep->name, value);
+                ep->driver_data = NULL;
+        }
+}
+
+void disable_endpoints(struct usb_composite_dev *cdev,
+                struct usb_ep *in, struct usb_ep *out,
+                struct usb_ep *iso_in, struct usb_ep *iso_out)
+{
+        disable_ep(cdev, in);
+        disable_ep(cdev, out);
+        if (iso_in)
+                disable_ep(cdev, iso_in);
+        if (iso_out)
+                disable_ep(cdev, iso_out);
+}
+
+static int
 sourcesink_bind(struct usb_configuration *c, struct usb_function *f)
 {
         struct usb_composite_dev *cdev = c->cdev;
@@ -450,7 +488,7 @@ no_iso:
 }
 
 static void
-sourcesink_unbind(struct usb_configuration *c, struct usb_function *f)
+sourcesink_free_func(struct usb_function *f)
 {
         usb_free_all_descriptors(f);
         kfree(func_to_ss(f));
@@ -531,8 +569,7 @@ static void source_sink_complete(struct usb_ep *ep, struct usb_request *req)
                         check_read_data(ss, req);
                         if (pattern != 2)
                                 memset(req->buf, 0x55, req->length);
-                } else
-                        reinit_write_data(ep, req);
+                }
                 break;
 
         /* this endpoint is normally active while we're configured */
@@ -758,31 +795,10 @@ static void sourcesink_disable(struct usb_function *f)
 
 /*-------------------------------------------------------------------------*/
 
-static int __init sourcesink_bind_config(struct usb_configuration *c)
-{
-        struct f_sourcesink     *ss;
-        int                     status;
-
-        ss = kzalloc(sizeof *ss, GFP_KERNEL);
-        if (!ss)
-                return -ENOMEM;
-
-        ss->function.name = "source/sink";
-        ss->function.bind = sourcesink_bind;
-        ss->function.unbind = sourcesink_unbind;
-        ss->function.set_alt = sourcesink_set_alt;
-        ss->function.get_alt = sourcesink_get_alt;
-        ss->function.disable = sourcesink_disable;
-
-        status = usb_add_function(c, &ss->function);
-        if (status)
-                kfree(ss);
-        return status;
-}
-
-static int sourcesink_setup(struct usb_configuration *c,
+static int sourcesink_setup(struct usb_function *f,
                 const struct usb_ctrlrequest *ctrl)
 {
+        struct usb_configuration        *c = f->config;
         struct usb_request      *req = c->cdev->req;
         int                     value = -EOPNOTSUPP;
         u16                     w_index = le16_to_cpu(ctrl->wIndex);
@@ -851,42 +867,76 @@ unknown:
         return value;
 }
 
-static struct usb_configuration sourcesink_driver = {
-        .label                  = "source/sink",
-        .strings                = sourcesink_strings,
-        .setup                  = sourcesink_setup,
-        .bConfigurationValue    = 3,
-        .bmAttributes           = USB_CONFIG_ATT_SELFPOWER,
-        /* .iConfiguration      = DYNAMIC */
-};
+static struct usb_function *source_sink_alloc_func(
+                struct usb_function_instance *fi)
+{
+        struct f_sourcesink     *ss;
+        struct f_ss_opts        *ss_opts;
 
-/**
- * sourcesink_add - add a source/sink testing configuration to a device
- * @cdev: the device to support the configuration
- */
-int __init sourcesink_add(struct usb_composite_dev *cdev, bool autoresume)
+        ss = kzalloc(sizeof(*ss), GFP_KERNEL);
+        if (!ss)
+                return NULL;
+
+        ss_opts =  container_of(fi, struct f_ss_opts, func_inst);
+        pattern = ss_opts->pattern;
+        isoc_interval = ss_opts->isoc_interval;
+        isoc_maxpacket = ss_opts->isoc_maxpacket;
+        isoc_mult = ss_opts->isoc_mult;
+        isoc_maxburst = ss_opts->isoc_maxburst;
+        buflen = ss_opts->bulk_buflen;
+
+        ss->function.name = "source/sink";
+        ss->function.bind = sourcesink_bind;
+        ss->function.set_alt = sourcesink_set_alt;
+        ss->function.get_alt = sourcesink_get_alt;
+        ss->function.disable = sourcesink_disable;
+        ss->function.setup = sourcesink_setup;
+        ss->function.strings = sourcesink_strings;
+
+        ss->function.free_func = sourcesink_free_func;
+
+        return &ss->function;
+}
+
+static void acm_free_instance(struct usb_function_instance *fi)
 {
-        int id;
+        struct f_ss_opts *ss_opts;
 
-        /* allocate string ID(s) */
-        id = usb_string_id(cdev);
-        if (id < 0)
-                return id;
-        strings_sourcesink[0].id = id;
+        ss_opts = container_of(fi, struct f_ss_opts, func_inst);
+        kfree(ss_opts);
+}
 
-        source_sink_intf_alt0.iInterface = id;
-        source_sink_intf_alt1.iInterface = id;
-        sourcesink_driver.iConfiguration = id;
+static struct usb_function_instance *source_sink_alloc_inst(void)
+{
+        struct f_ss_opts *ss_opts;
 
-        /* support autoresume for remote wakeup testing */
-        if (autoresume)
-                sourcesink_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+        ss_opts = kzalloc(sizeof(*ss_opts), GFP_KERNEL);
+        if (!ss_opts)
+                return ERR_PTR(-ENOMEM);
+        ss_opts->func_inst.free_func_inst = acm_free_instance;
+        return &ss_opts->func_inst;
+}
+DECLARE_USB_FUNCTION(SourceSink, source_sink_alloc_inst,
+                source_sink_alloc_func);
 
-        /* support OTG systems */
-        if (gadget_is_otg(cdev->gadget)) {
-                sourcesink_driver.descriptors = otg_desc;
-                sourcesink_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
-        }
+static int __init sslb_modinit(void)
+{
+        int ret;
 
-        return usb_add_config(cdev, &sourcesink_driver, sourcesink_bind_config);
+        ret = usb_function_register(&SourceSinkusb_func);
+        if (ret)
+                return ret;
+        ret = lb_modinit();
+        if (ret)
+                usb_function_unregister(&SourceSinkusb_func);
+        return ret;
+}
+static void __exit sslb_modexit(void)
+{
+        usb_function_unregister(&SourceSinkusb_func);
+        lb_modexit();
 }
+module_init(sslb_modinit);
+module_exit(sslb_modexit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/gadget/f_uac2.c b/drivers/usb/gadget/f_uac2.c
index d7da258fa3f6..c7468b6c07b0 100644
--- a/drivers/usb/gadget/f_uac2.c
+++ b/drivers/usb/gadget/f_uac2.c
@@ -260,19 +260,14 @@ static int
 uac2_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct snd_uac2_chip *uac2 = snd_pcm_substream_chip(substream);
-        struct audio_dev *agdev = uac2_to_agdev(uac2);
         struct uac2_rtd_params *prm;
         unsigned long flags;
-        struct usb_ep *ep;
         int err = 0;
 
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                ep = agdev->in_ep;
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 prm = &uac2->p_prm;
-        } else {
-                ep = agdev->out_ep;
+        else
                 prm = &uac2->c_prm;
-        }
 
         spin_lock_irqsave(&prm->lock, flags);
 
diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/f_uvc.c
index 5b629876941b..92efd6ec48af 100644
--- a/drivers/usb/gadget/f_uvc.c
+++ b/drivers/usb/gadget/f_uvc.c
@@ -16,6 +16,7 @@
 #include <linux/fs.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
+#include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/video.h>
@@ -419,7 +420,7 @@ uvc_register_video(struct uvc_device *uvc)
         video->parent = &cdev->gadget->dev;
         video->fops = &uvc_v4l2_fops;
         video->release = video_device_release;
-        strncpy(video->name, cdev->gadget->name, sizeof(video->name));
+        strlcpy(video->name, cdev->gadget->name, sizeof(video->name));
 
         uvc->vdev = video;
         video_set_drvdata(video, uvc);
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index ec50f18c8890..034477ce77c6 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -1894,7 +1894,7 @@ static int fsl_qe_stop(struct usb_gadget *gadget,
                 struct usb_gadget_driver *driver);
 
 /* defined in usb_gadget.h */
-static struct usb_gadget_ops qe_gadget_ops = {
+static const struct usb_gadget_ops qe_gadget_ops = {
         .get_frame = qe_get_frame,
         .udc_start = fsl_qe_start,
         .udc_stop = fsl_qe_stop,
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 667275cb7bad..04d5fef1440c 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1255,19 +1255,20 @@ static int fsl_pullup(struct usb_gadget *gadget, int is_on)
         return 0;
 }
 
-static int fsl_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int fsl_stop(struct usb_gadget_driver *driver);
+static int fsl_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
+static int fsl_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
 /* defined in gadget.h */
-static struct usb_gadget_ops fsl_gadget_ops = {
+static const struct usb_gadget_ops fsl_gadget_ops = {
         .get_frame = fsl_get_frame,
         .wakeup = fsl_wakeup,
 /*      .set_selfpowered = fsl_set_selfpowered, */ /* Always selfpowered */
         .vbus_session = fsl_vbus_session,
         .vbus_draw = fsl_vbus_draw,
         .pullup = fsl_pullup,
-        .start = fsl_start,
-        .stop = fsl_stop,
+        .udc_start = fsl_udc_start,
+        .udc_stop = fsl_udc_stop,
 };
 
 /* Set protocol stall on ep0, protocol stall will automatically be cleared
@@ -1951,22 +1952,12 @@ static irqreturn_t fsl_udc_irq(int irq, void *_udc)
  * Hook to gadget drivers
  * Called by initialization code of gadget drivers
 *----------------------------------------------------------------*/
-static int fsl_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int fsl_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        int retval = -ENODEV;
+        int retval = 0;
         unsigned long flags = 0;
 
-        if (!udc_controller)
-                return -ENODEV;
-
-        if (!driver || driver->max_speed < USB_SPEED_FULL
-                        || !bind || !driver->disconnect || !driver->setup)
-                return -EINVAL;
-
-        if (udc_controller->driver)
-                return -EBUSY;
-
         /* lock is needed but whether should use this lock or another */
         spin_lock_irqsave(&udc_controller->lock, flags);
 
@@ -1976,15 +1967,6 @@ static int fsl_start(struct usb_gadget_driver *driver,
         udc_controller->gadget.dev.driver = &driver->driver;
         spin_unlock_irqrestore(&udc_controller->lock, flags);
 
-        /* bind udc driver to gadget driver */
-        retval = bind(&udc_controller->gadget, driver);
-        if (retval) {
-                VDBG("bind to %s --> %d", driver->driver.name, retval);
-                udc_controller->gadget.dev.driver = NULL;
-                udc_controller->driver = NULL;
-                goto out;
-        }
-
         if (!IS_ERR_OR_NULL(udc_controller->transceiver)) {
                 /* Suspend the controller until OTG enable it */
                 udc_controller->stopped = 1;
@@ -2010,28 +1992,17 @@ static int fsl_start(struct usb_gadget_driver *driver,
                 udc_controller->ep0_state = WAIT_FOR_SETUP;
                 udc_controller->ep0_dir = 0;
         }
-        printk(KERN_INFO "%s: bind to driver %s\n",
-                        udc_controller->gadget.name, driver->driver.name);
 
-out:
-        if (retval)
-                printk(KERN_WARNING "gadget driver register failed %d\n",
-                       retval);
         return retval;
 }
 
 /* Disconnect from gadget driver */
-static int fsl_stop(struct usb_gadget_driver *driver)
+static int fsl_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
         struct fsl_ep *loop_ep;
         unsigned long flags;
 
-        if (!udc_controller)
-                return -ENODEV;
-
-        if (!driver || driver != udc_controller->driver || !driver->unbind)
-                return -EINVAL;
-
         if (!IS_ERR_OR_NULL(udc_controller->transceiver))
                 otg_set_peripheral(udc_controller->transceiver->otg, NULL);
 
@@ -2052,16 +2023,9 @@ static int fsl_stop(struct usb_gadget_driver *driver)
                 nuke(loop_ep, -ESHUTDOWN);
         spin_unlock_irqrestore(&udc_controller->lock, flags);
 
-        /* report disconnect; the controller is already quiesced */
-        driver->disconnect(&udc_controller->gadget);
-
-        /* unbind gadget and unhook driver. */
-        driver->unbind(&udc_controller->gadget);
         udc_controller->gadget.dev.driver = NULL;
         udc_controller->driver = NULL;
 
-        printk(KERN_WARNING "unregistered gadget driver '%s'\n",
-               driver->driver.name);
         return 0;
 }
 
diff --git a/drivers/usb/gadget/functions.c b/drivers/usb/gadget/functions.c
new file mode 100644
index 000000000000..b13f839e7368
--- /dev/null
+++ b/drivers/usb/gadget/functions.c
@@ -0,0 +1,116 @@
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/err.h>
+
+#include <linux/usb/composite.h>
+
+static LIST_HEAD(func_list);
+static DEFINE_MUTEX(func_lock);
+
+static struct usb_function_instance *try_get_usb_function_instance(const char *name)
+{
+        struct usb_function_driver *fd;
+        struct usb_function_instance *fi;
+
+        fi = ERR_PTR(-ENOENT);
+        mutex_lock(&func_lock);
+        list_for_each_entry(fd, &func_list, list) {
+
+                if (strcmp(name, fd->name))
+                        continue;
+
+                if (!try_module_get(fd->mod)) {
+                        fi = ERR_PTR(-EBUSY);
+                        break;
+                }
+                fi = fd->alloc_inst();
+                if (IS_ERR(fi))
+                        module_put(fd->mod);
+                else
+                        fi->fd = fd;
+                break;
+        }
+        mutex_unlock(&func_lock);
+        return fi;
+}
+
+struct usb_function_instance *usb_get_function_instance(const char *name)
+{
+        struct usb_function_instance *fi;
+        int ret;
+
+        fi = try_get_usb_function_instance(name);
+        if (!IS_ERR(fi))
+                return fi;
+        ret = PTR_ERR(fi);
+        if (ret != -ENOENT)
+                return fi;
+        ret = request_module("usbfunc:%s", name);
+        if (ret < 0)
+                return ERR_PTR(ret);
+        return try_get_usb_function_instance(name);
+}
+EXPORT_SYMBOL_GPL(usb_get_function_instance);
+
+struct usb_function *usb_get_function(struct usb_function_instance *fi)
+{
+        struct usb_function *f;
+
+        f = fi->fd->alloc_func(fi);
+        if (IS_ERR(f))
+                return f;
+        f->fi = fi;
+        return f;
+}
+EXPORT_SYMBOL_GPL(usb_get_function);
+
+void usb_put_function_instance(struct usb_function_instance *fi)
+{
+        struct module *mod;
+
+        if (!fi)
+                return;
+
+        mod = fi->fd->mod;
+        fi->free_func_inst(fi);
+        module_put(mod);
+}
+EXPORT_SYMBOL_GPL(usb_put_function_instance);
+
+void usb_put_function(struct usb_function *f)
+{
+        if (!f)
+                return;
+
+        f->free_func(f);
+}
+EXPORT_SYMBOL_GPL(usb_put_function);
+
+int usb_function_register(struct usb_function_driver *newf)
+{
+        struct usb_function_driver *fd;
+        int ret;
+
+        ret = -EEXIST;
+
+        mutex_lock(&func_lock);
+        list_for_each_entry(fd, &func_list, list) {
+                if (!strcmp(fd->name, newf->name))
+                        goto out;
+        }
+        ret = 0;
+        list_add_tail(&newf->list, &func_list);
+out:
+        mutex_unlock(&func_lock);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(usb_function_register);
+
+void usb_function_unregister(struct usb_function_driver *fd)
+{
+        mutex_lock(&func_lock);
+        list_del(&fd->list);
+        mutex_unlock(&func_lock);
+}
+EXPORT_SYMBOL_GPL(usb_function_unregister);
diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index fc7cb09ab52b..066cb89376de 100644
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -1308,65 +1308,28 @@ static void init_controller(struct fusb300 *fusb300)
         iowrite32(0xcfffff9f, fusb300->reg + FUSB300_OFFSET_IGER1);
 }
 /*------------------------------------------------------------------------*/
-static struct fusb300 *the_controller;
-
-static int fusb300_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int fusb300_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct fusb300 *fusb300 = the_controller;
-        int retval;
-
-        if (!driver
-                        || driver->max_speed < USB_SPEED_FULL
-                        || !bind
-                        || !driver->setup)
-                return -EINVAL;
-
-        if (!fusb300)
-                return -ENODEV;
-
-        if (fusb300->driver)
-                return -EBUSY;
+        struct fusb300 *fusb300 = to_fusb300(g);
 
         /* hook up the driver */
         driver->driver.bus = NULL;
         fusb300->driver = driver;
         fusb300->gadget.dev.driver = &driver->driver;
 
-        retval = device_add(&fusb300->gadget.dev);
-        if (retval) {
-                pr_err("device_add error (%d)\n", retval);
-                goto error;
-        }
-
-        retval = bind(&fusb300->gadget, driver);
-        if (retval) {
-                pr_err("bind to driver error (%d)\n", retval);
-                device_del(&fusb300->gadget.dev);
-                goto error;
-        }
-
         return 0;
-
-error:
-        fusb300->driver = NULL;
-        fusb300->gadget.dev.driver = NULL;
-
-        return retval;
 }
 
-static int fusb300_udc_stop(struct usb_gadget_driver *driver)
+static int fusb300_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct fusb300 *fusb300 = the_controller;
-
-        if (driver != fusb300->driver || !driver->unbind)
-                return -EINVAL;
+        struct fusb300 *fusb300 = to_fusb300(g);
 
         driver->unbind(&fusb300->gadget);
         fusb300->gadget.dev.driver = NULL;
 
         init_controller(fusb300);
-        device_del(&fusb300->gadget.dev);
         fusb300->driver = NULL;
 
         return 0;
@@ -1378,10 +1341,10 @@ static int fusb300_udc_pullup(struct usb_gadget *_gadget, int is_active)
         return 0;
 }
 
-static struct usb_gadget_ops fusb300_gadget_ops = {
+static const struct usb_gadget_ops fusb300_gadget_ops = {
         .pullup         = fusb300_udc_pullup,
-        .start          = fusb300_udc_start,
-        .stop           = fusb300_udc_stop,
+        .udc_start      = fusb300_udc_start,
+        .udc_stop       = fusb300_udc_stop,
 };
 
 static int __exit fusb300_remove(struct platform_device *pdev)
@@ -1505,8 +1468,6 @@ static int __init fusb300_probe(struct platform_device *pdev)
         fusb300->gadget.ep0 = &fusb300->ep[0]->ep;
         INIT_LIST_HEAD(&fusb300->gadget.ep0->ep_list);
 
-        the_controller = fusb300;
-
         fusb300->ep0_req = fusb300_alloc_request(&fusb300->ep[0]->ep,
                                 GFP_KERNEL);
         if (fusb300->ep0_req == NULL)
@@ -1517,9 +1478,19 @@ static int __init fusb300_probe(struct platform_device *pdev)
         if (ret)
                 goto err_add_udc;
 
+        ret = device_add(&fusb300->gadget.dev);
+        if (ret) {
+                pr_err("device_add error (%d)\n", ret);
+                goto err_add_device;
+        }
+
         dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
 
         return 0;
+
+err_add_device:
+        usb_del_gadget_udc(&fusb300->gadget);
+
 err_add_udc:
         fusb300_free_request(&fusb300->ep[0]->ep, fusb300->ep0_req);
 
diff --git a/drivers/usb/gadget/fusb300_udc.h b/drivers/usb/gadget/fusb300_udc.h
index 542cd83cc806..6ba444ae8dd5 100644
--- a/drivers/usb/gadget/fusb300_udc.h
+++ b/drivers/usb/gadget/fusb300_udc.h
@@ -673,4 +673,6 @@ struct fusb300 {
         u8                      reenum;         /* if re-enumeration */
 };
 
+#define to_fusb300(g)           (container_of((g), struct fusb300, gadget))
+
 #endif
diff --git a/drivers/usb/gadget/g_zero.h b/drivers/usb/gadget/g_zero.h
index 71ca193358b8..ef3e8515272b 100644
--- a/drivers/usb/gadget/g_zero.h
+++ b/drivers/usb/gadget/g_zero.h
@@ -6,11 +6,34 @@
 #ifndef __G_ZERO_H
 #define __G_ZERO_H
 
-#include <linux/usb/composite.h>
+struct usb_zero_options {
+        unsigned pattern;
+        unsigned isoc_interval;
+        unsigned isoc_maxpacket;
+        unsigned isoc_mult;
+        unsigned isoc_maxburst;
+        unsigned bulk_buflen;
+        unsigned qlen;
+};
 
-/* global state */
-extern unsigned buflen;
-extern const struct usb_descriptor_header *otg_desc[];
+struct f_ss_opts {
+        struct usb_function_instance func_inst;
+        unsigned pattern;
+        unsigned isoc_interval;
+        unsigned isoc_maxpacket;
+        unsigned isoc_mult;
+        unsigned isoc_maxburst;
+        unsigned bulk_buflen;
+};
+
+struct f_lb_opts {
+        struct usb_function_instance func_inst;
+        unsigned bulk_buflen;
+        unsigned qlen;
+};
+
+void lb_modexit(void);
+int lb_modinit(void);
 
 /* common utilities */
 struct usb_request *alloc_ep_req(struct usb_ep *ep, int len);
@@ -19,8 +42,4 @@ void disable_endpoints(struct usb_composite_dev *cdev,
                 struct usb_ep *in, struct usb_ep *out,
                 struct usb_ep *iso_in, struct usb_ep *iso_out);
 
-/* configuration-specific linkup */
-int sourcesink_add(struct usb_composite_dev *cdev, bool autoresume);
-int loopback_add(struct usb_composite_dev *cdev, bool autoresume);
-
 #endif /* __G_ZERO_H */
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 881aab86ae99..e879e2c9f461 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -125,7 +125,7 @@ static struct usb_configuration midi_config = {
         .bConfigurationValue = 1,
         /* .iConfiguration = DYNAMIC */
         .bmAttributes   = USB_CONFIG_ATT_ONE,
-        .bMaxPower      = CONFIG_USB_GADGET_VBUS_DRAW / 2,
+        .MaxPower       = CONFIG_USB_GADGET_VBUS_DRAW,
 };
 
 static int __init midi_bind_config(struct usb_configuration *c)
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 51037cb78604..85742d4c67df 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -993,14 +993,15 @@ static int goku_get_frame(struct usb_gadget *_gadget)
         return -EOPNOTSUPP;
 }
 
-static int goku_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int goku_stop(struct usb_gadget_driver *driver);
+static int goku_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
+static int goku_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
 
 static const struct usb_gadget_ops goku_ops = {
         .get_frame      = goku_get_frame,
-        .start          = goku_start,
-        .stop           = goku_stop,
+        .udc_start      = goku_udc_start,
+        .udc_stop       = goku_udc_stop,
         // no remote wakeup
         // not selfpowered
 };
@@ -1339,50 +1340,28 @@ static void udc_enable(struct goku_udc *dev)
  * - one function driver, initted second
  */
 
-static struct goku_udc  *the_controller;
-
 /* when a driver is successfully registered, it will receive
  * control requests including set_configuration(), which enables
  * non-control requests.  then usb traffic follows until a
  * disconnect is reported.  then a host may connect again, or
  * the driver might get unbound.
  */
-static int goku_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int goku_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct goku_udc *dev = the_controller;
-        int                     retval;
-
-        if (!driver
-                        || driver->max_speed < USB_SPEED_FULL
-                        || !bind
-                        || !driver->disconnect
-                        || !driver->setup)
-                return -EINVAL;
-        if (!dev)
-                return -ENODEV;
-        if (dev->driver)
-                return -EBUSY;
+        struct goku_udc *dev = to_goku_udc(g);
 
         /* hook up the driver */
         driver->driver.bus = NULL;
         dev->driver = driver;
         dev->gadget.dev.driver = &driver->driver;
-        retval = bind(&dev->gadget, driver);
-        if (retval) {
-                DBG(dev, "bind to driver %s --> error %d\n",
-                                driver->driver.name, retval);
-                dev->driver = NULL;
-                dev->gadget.dev.driver = NULL;
-                return retval;
-        }
 
-        /* then enable host detection and ep0; and we're ready
+        /*
+         * then enable host detection and ep0; and we're ready
          * for set_configuration as well as eventual disconnect.
          */
         udc_enable(dev);
 
-        DBG(dev, "registered gadget driver '%s'\n", driver->driver.name);
         return 0;
 }
 
@@ -1400,35 +1379,23 @@ stop_activity(struct goku_udc *dev, struct usb_gadget_driver *driver)
         udc_reset (dev);
         for (i = 0; i < 4; i++)
                 nuke(&dev->ep [i], -ESHUTDOWN);
-        if (driver) {
-                spin_unlock(&dev->lock);
-                driver->disconnect(&dev->gadget);
-                spin_lock(&dev->lock);
-        }
 
         if (dev->driver)
                 udc_enable(dev);
 }
 
-static int goku_stop(struct usb_gadget_driver *driver)
+static int goku_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct goku_udc *dev = the_controller;
+        struct goku_udc *dev = to_goku_udc(g);
         unsigned long   flags;
 
-        if (!dev)
-                return -ENODEV;
-        if (!driver || driver != dev->driver || !driver->unbind)
-                return -EINVAL;
-
         spin_lock_irqsave(&dev->lock, flags);
         dev->driver = NULL;
         stop_activity(dev, driver);
         spin_unlock_irqrestore(&dev->lock, flags);
-
-        driver->unbind(&dev->gadget);
         dev->gadget.dev.driver = NULL;
 
-        DBG(dev, "unregistered driver '%s'\n", driver->driver.name);
         return 0;
 }
 
@@ -1754,7 +1721,6 @@ static void goku_remove(struct pci_dev *pdev)
 
         pci_set_drvdata(pdev, NULL);
         dev->regs = NULL;
-        the_controller = NULL;
 
         INFO(dev, "unbind\n");
 }
@@ -1770,13 +1736,6 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         void __iomem            *base = NULL;
         int                     retval;
 
-        /* if you want to support more than one controller in a system,
-         * usb_gadget_driver_{register,unregister}() must change.
-         */
-        if (the_controller) {
-                pr_warning("ignoring %s\n", pci_name(pdev));
-                return -EBUSY;
-        }
         if (!pdev->irq) {
                 printk(KERN_ERR "Check PCI %s IRQ setup!\n", pci_name(pdev));
                 retval = -ENODEV;
@@ -1851,7 +1810,6 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         create_proc_read_entry(proc_node_name, 0, NULL, udc_proc_read, dev);
 #endif
 
-        the_controller = dev;
         retval = device_register(&dev->gadget.dev);
         if (retval) {
                 put_device(&dev->gadget.dev);
diff --git a/drivers/usb/gadget/goku_udc.h b/drivers/usb/gadget/goku_udc.h
index 85cdce0d1901..b4470d2b1d86 100644
--- a/drivers/usb/gadget/goku_udc.h
+++ b/drivers/usb/gadget/goku_udc.h
@@ -261,6 +261,7 @@ struct goku_udc {
         /* statistics... */
         unsigned long                   irqs;
 };
+#define to_goku_udc(g)          (container_of((g), struct goku_udc, gadget))
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index dfce0cfe4e6f..c1b8c2dd808d 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1463,42 +1463,16 @@ static struct usb_ep_ops m66592_ep_ops = {
 };
 
 /*-------------------------------------------------------------------------*/
-static struct m66592 *the_controller;
-
-static int m66592_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int m66592_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct m66592 *m66592 = the_controller;
-        int retval;
-
-        if (!driver
-                        || driver->max_speed < USB_SPEED_HIGH
-                        || !bind
-                        || !driver->setup)
-                return -EINVAL;
-        if (!m66592)
-                return -ENODEV;
-        if (m66592->driver)
-                return -EBUSY;
+        struct m66592 *m66592 = to_m66592(g);
 
         /* hook up the driver */
         driver->driver.bus = NULL;
         m66592->driver = driver;
         m66592->gadget.dev.driver = &driver->driver;
 
-        retval = device_add(&m66592->gadget.dev);
-        if (retval) {
-                pr_err("device_add error (%d)\n", retval);
-                goto error;
-        }
-
-        retval = bind(&m66592->gadget, driver);
-        if (retval) {
-                pr_err("bind to driver error (%d)\n", retval);
-                device_del(&m66592->gadget.dev);
-                goto error;
-        }
-
         m66592_bset(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0);
         if (m66592_read(m66592, M66592_INTSTS0) & M66592_VBSTS) {
                 m66592_start_xclock(m66592);
@@ -1510,26 +1484,12 @@ static int m66592_start(struct usb_gadget_driver *driver,
         }
 
         return 0;
-
-error:
-        m66592->driver = NULL;
-        m66592->gadget.dev.driver = NULL;
-
-        return retval;
 }
 
-static int m66592_stop(struct usb_gadget_driver *driver)
+static int m66592_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct m66592 *m66592 = the_controller;
-        unsigned long flags;
-
-        if (driver != m66592->driver || !driver->unbind)
-                return -EINVAL;
-
-        spin_lock_irqsave(&m66592->lock, flags);
-        if (m66592->gadget.speed != USB_SPEED_UNKNOWN)
-                m66592_usb_disconnect(m66592);
-        spin_unlock_irqrestore(&m66592->lock, flags);
+        struct m66592 *m66592 = to_m66592(g);
 
         m66592_bclr(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0);
 
@@ -1539,8 +1499,8 @@ static int m66592_stop(struct usb_gadget_driver *driver)
         init_controller(m66592);
         disable_controller(m66592);
 
-        device_del(&m66592->gadget.dev);
         m66592->driver = NULL;
+
         return 0;
 }
 
@@ -1566,10 +1526,10 @@ static int m66592_pullup(struct usb_gadget *gadget, int is_on)
         return 0;
 }
 
-static struct usb_gadget_ops m66592_gadget_ops = {
+static const struct usb_gadget_ops m66592_gadget_ops = {
         .get_frame              = m66592_get_frame,
-        .start                  = m66592_start,
-        .stop                   = m66592_stop,
+        .udc_start              = m66592_udc_start,
+        .udc_stop               = m66592_udc_stop,
         .pullup                 = m66592_pullup,
 };
 
@@ -1578,6 +1538,7 @@ static int __exit m66592_remove(struct platform_device *pdev)
         struct m66592           *m66592 = dev_get_drvdata(&pdev->dev);
 
         usb_del_gadget_udc(&m66592->gadget);
+        device_del(&m66592->gadget.dev);
 
         del_timer_sync(&m66592->timer);
         iounmap(m66592->reg);
@@ -1706,8 +1667,6 @@ static int __init m66592_probe(struct platform_device *pdev)
         m66592->pipenum2ep[0] = &m66592->ep[0];
         m66592->epaddr2ep[0] = &m66592->ep[0];
 
-        the_controller = m66592;
-
         m66592->ep0_req = m66592_alloc_request(&m66592->ep[0].ep, GFP_KERNEL);
         if (m66592->ep0_req == NULL)
                 goto clean_up3;
@@ -1715,6 +1674,12 @@ static int __init m66592_probe(struct platform_device *pdev)
 
         init_controller(m66592);
 
+        ret = device_add(&m66592->gadget.dev);
+        if (ret) {
+                pr_err("device_add error (%d)\n", ret);
+                goto err_device_add;
+        }
+
         ret = usb_add_gadget_udc(&pdev->dev, &m66592->gadget);
         if (ret)
                 goto err_add_udc;
@@ -1723,6 +1688,9 @@ static int __init m66592_probe(struct platform_device *pdev)
         return 0;
 
 err_add_udc:
+        device_del(&m66592->gadget.dev);
+
+err_device_add:
         m66592_free_request(&m66592->ep[0].ep, m66592->ep0_req);
 
 clean_up3:
diff --git a/drivers/usb/gadget/m66592-udc.h b/drivers/usb/gadget/m66592-udc.h
index 16c7e14678b8..96d49d7bfb6b 100644
--- a/drivers/usb/gadget/m66592-udc.h
+++ b/drivers/usb/gadget/m66592-udc.h
@@ -492,6 +492,7 @@ struct m66592 {
         int isochronous;
         int num_dma;
 };
+#define to_m66592(g)    (container_of((g), struct m66592, gadget))
 
 #define gadget_to_m66592(_gadget) container_of(_gadget, struct m66592, gadget)
 #define m66592_to_gadget(m66592) (&m66592->gadget)
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 88472bf7dbb7..20bbbf917fc2 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
+#include "u_serial.h"
 #if defined USB_ETH_RNDIS
 #  undef USB_ETH_RNDIS
 #endif
@@ -42,9 +43,6 @@ MODULE_LICENSE("GPL");
  */
 #include "f_mass_storage.c"
 
-#include "u_serial.c"
-#include "f_acm.c"
-
 #include "f_ecm.c"
 #include "f_subset.c"
 #ifdef USB_ETH_RNDIS
@@ -137,10 +135,13 @@ static struct fsg_common fsg_common;
 
 static u8 hostaddr[ETH_ALEN];
 
+static unsigned char tty_line;
+static struct usb_function_instance *fi_acm;
 
 /********** RNDIS **********/
 
 #ifdef USB_ETH_RNDIS
+static struct usb_function *f_acm_rndis;
 
 static __init int rndis_do_config(struct usb_configuration *c)
 {
@@ -155,15 +156,25 @@ static __init int rndis_do_config(struct usb_configuration *c)
         if (ret < 0)
                 return ret;
 
-        ret = acm_bind_config(c, 0);
-        if (ret < 0)
-                return ret;
+        f_acm_rndis = usb_get_function(fi_acm);
+        if (IS_ERR(f_acm_rndis))
+                goto err_func_acm;
+
+        ret = usb_add_function(c, f_acm_rndis);
+        if (ret)
+                goto err_conf;
 
         ret = fsg_bind_config(c->cdev, c, &fsg_common);
         if (ret < 0)
-                return ret;
+                goto err_fsg;
 
         return 0;
+err_fsg:
+        usb_remove_function(c, f_acm_rndis);
+err_conf:
+        usb_put_function(f_acm_rndis);
+err_func_acm:
+        return ret;
 }
 
 static int rndis_config_register(struct usb_composite_dev *cdev)
@@ -192,6 +203,7 @@ static int rndis_config_register(struct usb_composite_dev *cdev)
 /********** CDC ECM **********/
 
 #ifdef CONFIG_USB_G_MULTI_CDC
+static struct usb_function *f_acm_multi;
 
 static __init int cdc_do_config(struct usb_configuration *c)
 {
@@ -206,15 +218,26 @@ static __init int cdc_do_config(struct usb_configuration *c)
         if (ret < 0)
                 return ret;
 
-        ret = acm_bind_config(c, 0);
-        if (ret < 0)
-                return ret;
+        /* implicit port_num is zero */
+        f_acm_multi = usb_get_function(fi_acm);
+        if (IS_ERR(f_acm_multi))
+                goto err_func_acm;
+
+        ret = usb_add_function(c, f_acm_multi);
+        if (ret)
+                goto err_conf;
 
         ret = fsg_bind_config(c->cdev, c, &fsg_common);
         if (ret < 0)
-                return ret;
+                goto err_fsg;
 
         return 0;
+err_fsg:
+        usb_remove_function(c, f_acm_multi);
+err_conf:
+        usb_put_function(f_acm_multi);
+err_func_acm:
+        return ret;
 }
 
 static int cdc_config_register(struct usb_composite_dev *cdev)
@@ -243,10 +266,10 @@ static int cdc_config_register(struct usb_composite_dev *cdev)
 
 /****************************** Gadget Bind ******************************/
 
-
 static int __ref multi_bind(struct usb_composite_dev *cdev)
 {
         struct usb_gadget *gadget = cdev->gadget;
+        struct f_serial_opts *opts;
         int status;
 
         if (!can_support_ecm(cdev->gadget)) {
@@ -261,10 +284,19 @@ static int __ref multi_bind(struct usb_composite_dev *cdev)
                 return status;
 
         /* set up serial link layer */
-        status = gserial_setup(cdev->gadget, 1);
+        status = gserial_alloc_line(&tty_line);
         if (status < 0)
                 goto fail0;
 
+        fi_acm = usb_get_function_instance("acm");
+        if (IS_ERR(fi_acm)) {
+                status = PTR_ERR(fi_acm);
+                goto fail0dot5;
+        }
+
+        opts = container_of(fi_acm, struct f_serial_opts, func_inst);
+        opts->port_num = tty_line;
+
         /* set up mass storage function */
         {
                 void *retp;
@@ -301,7 +333,9 @@ static int __ref multi_bind(struct usb_composite_dev *cdev)
 fail2:
         fsg_common_put(&fsg_common);
 fail1:
-        gserial_cleanup();
+        usb_put_function_instance(fi_acm);
+fail0dot5:
+        gserial_free_line(tty_line);
 fail0:
         gether_cleanup();
         return status;
@@ -309,7 +343,14 @@ fail0:
 
 static int __exit multi_unbind(struct usb_composite_dev *cdev)
 {
-        gserial_cleanup();
+#ifdef CONFIG_USB_G_MULTI_CDC
+        usb_put_function(f_acm_multi);
+#endif
+#ifdef USB_ETH_RNDIS
+        usb_put_function(f_acm_rndis);
+#endif
+        usb_put_function_instance(fi_acm);
+        gserial_free_line(tty_line);
         gether_cleanup();
         return 0;
 }
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index 6e8b1272ebce..c8cf959057fe 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -61,9 +61,6 @@ static DECLARE_COMPLETION(release_done);
 static const char driver_name[] = "mv_udc";
 static const char driver_desc[] = DRIVER_DESC;
 
-/* controller device global variable */
-static struct mv_udc    *the_controller;
-
 static void nuke(struct mv_ep *ep, int status);
 static void stop_activity(struct mv_udc *udc, struct usb_gadget_driver *driver);
 
@@ -1268,9 +1265,8 @@ static int mv_udc_pullup(struct usb_gadget *gadget, int is_on)
         return retval;
 }
 
-static int mv_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int mv_udc_stop(struct usb_gadget_driver *driver);
+static int mv_udc_start(struct usb_gadget *, struct usb_gadget_driver *);
+static int mv_udc_stop(struct usb_gadget *, struct usb_gadget_driver *);
 /* device controller usb_gadget_ops structure */
 static const struct usb_gadget_ops mv_ops = {
 
@@ -1285,8 +1281,8 @@ static const struct usb_gadget_ops mv_ops = {
 
         /* D+ pullup, software-controlled connect/disconnect to USB host */
         .pullup         = mv_udc_pullup,
-        .start          = mv_udc_start,
-        .stop           = mv_udc_stop,
+        .udc_start      = mv_udc_start,
+        .udc_stop       = mv_udc_stop,
 };
 
 static int eps_init(struct mv_udc *udc)
@@ -1373,15 +1369,14 @@ static void stop_activity(struct mv_udc *udc, struct usb_gadget_driver *driver)
         }
 }
 
-static int mv_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int mv_udc_start(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver)
 {
-        struct mv_udc *udc = the_controller;
+        struct mv_udc *udc;
         int retval = 0;
         unsigned long flags;
 
-        if (!udc)
-                return -ENODEV;
+        udc = container_of(gadget, struct mv_udc, gadget);
 
         if (udc->driver)
                 return -EBUSY;
@@ -1399,26 +1394,14 @@ static int mv_udc_start(struct usb_gadget_driver *driver,
 
         spin_unlock_irqrestore(&udc->lock, flags);
 
-        retval = bind(&udc->gadget, driver);
-        if (retval) {
-                dev_err(&udc->dev->dev, "bind to driver %s --> %d\n",
-                                driver->driver.name, retval);
-                udc->driver = NULL;
-                udc->gadget.dev.driver = NULL;
-                return retval;
-        }
-
-        if (!IS_ERR_OR_NULL(udc->transceiver)) {
+        if (udc->transceiver) {
                 retval = otg_set_peripheral(udc->transceiver->otg,
                                         &udc->gadget);
                 if (retval) {
                         dev_err(&udc->dev->dev,
                                 "unable to register peripheral to otg\n");
-                        if (driver->unbind) {
-                                driver->unbind(&udc->gadget);
-                                udc->gadget.dev.driver = NULL;
-                                udc->driver = NULL;
-                        }
+                        udc->driver = NULL;
+                        udc->gadget.dev.driver = NULL;
                         return retval;
                 }
         }
@@ -1433,13 +1416,13 @@ static int mv_udc_start(struct usb_gadget_driver *driver,
         return 0;
 }
 
-static int mv_udc_stop(struct usb_gadget_driver *driver)
+static int mv_udc_stop(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver)
 {
-        struct mv_udc *udc = the_controller;
+        struct mv_udc *udc;
         unsigned long flags;
 
-        if (!udc)
-                return -ENODEV;
+        udc = container_of(gadget, struct mv_udc, gadget);
 
         spin_lock_irqsave(&udc->lock, flags);
 
@@ -1454,7 +1437,6 @@ static int mv_udc_stop(struct usb_gadget_driver *driver)
         spin_unlock_irqrestore(&udc->lock, flags);
 
         /* unbind gadget driver */
-        driver->unbind(&udc->gadget);
         udc->gadget.dev.driver = NULL;
         udc->driver = NULL;
 
@@ -1472,10 +1454,13 @@ static void mv_set_ptc(struct mv_udc *udc, u32 mode)
 
 static void prime_status_complete(struct usb_ep *ep, struct usb_request *_req)
 {
-        struct mv_udc *udc = the_controller;
+        struct mv_ep *mvep = container_of(ep, struct mv_ep, ep);
         struct mv_req *req = container_of(_req, struct mv_req, req);
+        struct mv_udc *udc;
         unsigned long flags;
 
+        udc = mvep->udc;
+
         dev_info(&udc->dev->dev, "switch to test mode %d\n", req->test_mode);
 
         spin_lock_irqsave(&udc->lock, flags);
@@ -2123,15 +2108,18 @@ static void mv_udc_vbus_work(struct work_struct *work)
 /* release device structure */
 static void gadget_release(struct device *_dev)
 {
-        struct mv_udc *udc = the_controller;
+        struct mv_udc *udc;
+
+        udc = dev_get_drvdata(_dev);
 
         complete(udc->done);
 }
 
-static int mv_udc_remove(struct platform_device *dev)
+static int mv_udc_remove(struct platform_device *pdev)
 {
-        struct mv_udc *udc = the_controller;
-        int clk_i;
+        struct mv_udc *udc;
+
+        udc = platform_get_drvdata(pdev);
 
         usb_del_gadget_udc(&udc->gadget);
 
@@ -2140,57 +2128,27 @@ static int mv_udc_remove(struct platform_device *dev)
                 destroy_workqueue(udc->qwork);
         }
 
-        /*
-         * If we have transceiver inited,
-         * then vbus irq will not be requested in udc driver.
-         */
-        if (udc->pdata && udc->pdata->vbus
-                && udc->clock_gating && IS_ERR_OR_NULL(udc->transceiver))
-                free_irq(udc->pdata->vbus->irq, &dev->dev);
-
         /* free memory allocated in probe */
         if (udc->dtd_pool)
                 dma_pool_destroy(udc->dtd_pool);
 
         if (udc->ep_dqh)
-                dma_free_coherent(&dev->dev, udc->ep_dqh_size,
+                dma_free_coherent(&pdev->dev, udc->ep_dqh_size,
                         udc->ep_dqh, udc->ep_dqh_dma);
 
-        kfree(udc->eps);
-
-        if (udc->irq)
-                free_irq(udc->irq, &dev->dev);
-
         mv_udc_disable(udc);
 
-        if (udc->cap_regs)
-                iounmap(udc->cap_regs);
-
-        if (udc->phy_regs)
-                iounmap(udc->phy_regs);
-
-        if (udc->status_req) {
-                kfree(udc->status_req->req.buf);
-                kfree(udc->status_req);
-        }
-
-        for (clk_i = 0; clk_i <= udc->clknum; clk_i++)
-                clk_put(udc->clk[clk_i]);
-
         device_unregister(&udc->gadget.dev);
 
         /* free dev, wait for the release() finished */
         wait_for_completion(udc->done);
-        kfree(udc);
-
-        the_controller = NULL;
 
         return 0;
 }
 
-static int mv_udc_probe(struct platform_device *dev)
+static int mv_udc_probe(struct platform_device *pdev)
 {
-        struct mv_usb_platform_data *pdata = dev->dev.platform_data;
+        struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
         struct mv_udc *udc;
         int retval = 0;
         int clk_i = 0;
@@ -2198,71 +2156,73 @@ static int mv_udc_probe(struct platform_device *dev)
         size_t size;
 
         if (pdata == NULL) {
-                dev_err(&dev->dev, "missing platform_data\n");
+                dev_err(&pdev->dev, "missing platform_data\n");
                 return -ENODEV;
         }
 
         size = sizeof(*udc) + sizeof(struct clk *) * pdata->clknum;
-        udc = kzalloc(size, GFP_KERNEL);
+        udc = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
         if (udc == NULL) {
-                dev_err(&dev->dev, "failed to allocate memory for udc\n");
+                dev_err(&pdev->dev, "failed to allocate memory for udc\n");
                 return -ENOMEM;
         }
 
-        the_controller = udc;
         udc->done = &release_done;
-        udc->pdata = dev->dev.platform_data;
+        udc->pdata = pdev->dev.platform_data;
         spin_lock_init(&udc->lock);
 
-        udc->dev = dev;
+        udc->dev = pdev;
 
 #ifdef CONFIG_USB_OTG_UTILS
-        if (pdata->mode == MV_USB_MODE_OTG)
-                udc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
+        if (pdata->mode == MV_USB_MODE_OTG) {
+                udc->transceiver = devm_usb_get_phy(&pdev->dev,
+                                        USB_PHY_TYPE_USB2);
+                if (IS_ERR_OR_NULL(udc->transceiver)) {
+                        udc->transceiver = NULL;
+                        return -ENODEV;
+                }
+        }
 #endif
 
         udc->clknum = pdata->clknum;
         for (clk_i = 0; clk_i < udc->clknum; clk_i++) {
-                udc->clk[clk_i] = clk_get(&dev->dev, pdata->clkname[clk_i]);
+                udc->clk[clk_i] = devm_clk_get(&pdev->dev,
+                                        pdata->clkname[clk_i]);
                 if (IS_ERR(udc->clk[clk_i])) {
                         retval = PTR_ERR(udc->clk[clk_i]);
-                        goto err_put_clk;
+                        return retval;
                 }
         }
 
         r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "capregs");
         if (r == NULL) {
-                dev_err(&dev->dev, "no I/O memory resource defined\n");
-                retval = -ENODEV;
-                goto err_put_clk;
+                dev_err(&pdev->dev, "no I/O memory resource defined\n");
+                return -ENODEV;
         }
 
         udc->cap_regs = (struct mv_cap_regs __iomem *)
-                ioremap(r->start, resource_size(r));
+                devm_ioremap(&pdev->dev, r->start, resource_size(r));
         if (udc->cap_regs == NULL) {
-                dev_err(&dev->dev, "failed to map I/O memory\n");
-                retval = -EBUSY;
-                goto err_put_clk;
+                dev_err(&pdev->dev, "failed to map I/O memory\n");
+                return -EBUSY;
         }
 
         r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "phyregs");
         if (r == NULL) {
-                dev_err(&dev->dev, "no phy I/O memory resource defined\n");
-                retval = -ENODEV;
-                goto err_iounmap_capreg;
+                dev_err(&pdev->dev, "no phy I/O memory resource defined\n");
+                return -ENODEV;
         }
 
         udc->phy_regs = ioremap(r->start, resource_size(r));
         if (udc->phy_regs == NULL) {
-                dev_err(&dev->dev, "failed to map phy I/O memory\n");
-                retval = -EBUSY;
-                goto err_iounmap_capreg;
+                dev_err(&pdev->dev, "failed to map phy I/O memory\n");
+                return -EBUSY;
         }
 
         /* we will acces controller register, so enable the clk */
         retval = mv_udc_enable_internal(udc);
         if (retval)
-                goto err_iounmap_phyreg;
+                return retval;
 
         udc->op_regs =
                 (struct mv_op_regs __iomem *)((unsigned long)udc->cap_regs
@@ -2279,11 +2239,11 @@ static int mv_udc_probe(struct platform_device *dev)
 
         size = udc->max_eps * sizeof(struct mv_dqh) *2;
         size = (size + DQH_ALIGNMENT - 1) & ~(DQH_ALIGNMENT - 1);
-        udc->ep_dqh = dma_alloc_coherent(&dev->dev, size,
+        udc->ep_dqh = dma_alloc_coherent(&pdev->dev, size,
                                         &udc->ep_dqh_dma, GFP_KERNEL);
 
         if (udc->ep_dqh == NULL) {
-                dev_err(&dev->dev, "allocate dQH memory failed\n");
+                dev_err(&pdev->dev, "allocate dQH memory failed\n");
                 retval = -ENOMEM;
                 goto err_disable_clock;
         }
@@ -2291,7 +2251,7 @@ static int mv_udc_probe(struct platform_device *dev)
 
         /* create dTD dma_pool resource */
         udc->dtd_pool = dma_pool_create("mv_dtd",
-                        &dev->dev,
+                        &pdev->dev,
                         sizeof(struct mv_dtd),
                         DTD_ALIGNMENT,
                         DMA_BOUNDARY);
@@ -2302,19 +2262,20 @@ static int mv_udc_probe(struct platform_device *dev)
         }
 
         size = udc->max_eps * sizeof(struct mv_ep) *2;
-        udc->eps = kzalloc(size, GFP_KERNEL);
+        udc->eps = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
         if (udc->eps == NULL) {
-                dev_err(&dev->dev, "allocate ep memory failed\n");
+                dev_err(&pdev->dev, "allocate ep memory failed\n");
                 retval = -ENOMEM;
                 goto err_destroy_dma;
         }
 
         /* initialize ep0 status request structure */
-        udc->status_req = kzalloc(sizeof(struct mv_req), GFP_KERNEL);
+        udc->status_req = devm_kzalloc(&pdev->dev, sizeof(struct mv_req),
+                                        GFP_KERNEL);
         if (!udc->status_req) {
-                dev_err(&dev->dev, "allocate status_req memory failed\n");
+                dev_err(&pdev->dev, "allocate status_req memory failed\n");
                 retval = -ENOMEM;
-                goto err_free_eps;
+                goto err_destroy_dma;
         }
         INIT_LIST_HEAD(&udc->status_req->queue);
 
@@ -2329,17 +2290,17 @@ static int mv_udc_probe(struct platform_device *dev)
 
         r = platform_get_resource(udc->dev, IORESOURCE_IRQ, 0);
         if (r == NULL) {
-                dev_err(&dev->dev, "no IRQ resource defined\n");
+                dev_err(&pdev->dev, "no IRQ resource defined\n");
                 retval = -ENODEV;
-                goto err_free_status_req;
+                goto err_destroy_dma;
         }
         udc->irq = r->start;
-        if (request_irq(udc->irq, mv_udc_irq,
+        if (devm_request_irq(&pdev->dev, udc->irq, mv_udc_irq,
                 IRQF_SHARED, driver_name, udc)) {
-                dev_err(&dev->dev, "Request irq %d for UDC failed\n",
+                dev_err(&pdev->dev, "Request irq %d for UDC failed\n",
                         udc->irq);
                 retval = -ENODEV;
-                goto err_free_status_req;
+                goto err_destroy_dma;
         }
 
         /* initialize gadget structure */
@@ -2351,26 +2312,27 @@ static int mv_udc_probe(struct platform_device *dev)
 
         /* the "gadget" abstracts/virtualizes the controller */
         dev_set_name(&udc->gadget.dev, "gadget");
-        udc->gadget.dev.parent = &dev->dev;
-        udc->gadget.dev.dma_mask = dev->dev.dma_mask;
+        udc->gadget.dev.parent = &pdev->dev;
+        udc->gadget.dev.dma_mask = pdev->dev.dma_mask;
         udc->gadget.dev.release = gadget_release;
         udc->gadget.name = driver_name;         /* gadget name */
 
         retval = device_register(&udc->gadget.dev);
         if (retval)
-                goto err_free_irq;
+                goto err_destroy_dma;
 
         eps_init(udc);
 
         /* VBUS detect: we can disable/enable clock on demand.*/
-        if (!IS_ERR_OR_NULL(udc->transceiver))
+        if (udc->transceiver)
                 udc->clock_gating = 1;
         else if (pdata->vbus) {
                 udc->clock_gating = 1;
-                retval = request_threaded_irq(pdata->vbus->irq, NULL,
+                retval = devm_request_threaded_irq(&pdev->dev,
+                                pdata->vbus->irq, NULL,
                                 mv_udc_vbus_irq, IRQF_ONESHOT, "vbus", udc);
                 if (retval) {
-                        dev_info(&dev->dev,
+                        dev_info(&pdev->dev,
                                 "Can not request irq for VBUS, "
                                 "disable clock gating\n");
                         udc->clock_gating = 0;
@@ -2378,7 +2340,7 @@ static int mv_udc_probe(struct platform_device *dev)
 
                 udc->qwork = create_singlethread_workqueue("mv_udc_queue");
                 if (!udc->qwork) {
-                        dev_err(&dev->dev, "cannot create workqueue\n");
+                        dev_err(&pdev->dev, "cannot create workqueue\n");
                         retval = -ENOMEM;
                         goto err_unregister;
                 }
@@ -2396,53 +2358,40 @@ static int mv_udc_probe(struct platform_device *dev)
         else
                 udc->vbus_active = 1;
 
-        retval = usb_add_gadget_udc(&dev->dev, &udc->gadget);
+        retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget);
         if (retval)
-                goto err_unregister;
+                goto err_create_workqueue;
 
-        dev_info(&dev->dev, "successful probe UDC device %s clock gating.\n",
+        platform_set_drvdata(pdev, udc);
+        dev_info(&pdev->dev, "successful probe UDC device %s clock gating.\n",
                 udc->clock_gating ? "with" : "without");
 
         return 0;
 
+err_create_workqueue:
+        destroy_workqueue(udc->qwork);
 err_unregister:
-        if (udc->pdata && udc->pdata->vbus
-                && udc->clock_gating && IS_ERR_OR_NULL(udc->transceiver))
-                free_irq(pdata->vbus->irq, &dev->dev);
         device_unregister(&udc->gadget.dev);
-err_free_irq:
-        free_irq(udc->irq, &dev->dev);
-err_free_status_req:
-        kfree(udc->status_req->req.buf);
-        kfree(udc->status_req);
-err_free_eps:
-        kfree(udc->eps);
 err_destroy_dma:
         dma_pool_destroy(udc->dtd_pool);
 err_free_dma:
-        dma_free_coherent(&dev->dev, udc->ep_dqh_size,
+        dma_free_coherent(&pdev->dev, udc->ep_dqh_size,
                         udc->ep_dqh, udc->ep_dqh_dma);
 err_disable_clock:
         mv_udc_disable_internal(udc);
-err_iounmap_phyreg:
-        iounmap(udc->phy_regs);
-err_iounmap_capreg:
-        iounmap(udc->cap_regs);
-err_put_clk:
-        for (clk_i--; clk_i >= 0; clk_i--)
-                clk_put(udc->clk[clk_i]);
-        the_controller = NULL;
-        kfree(udc);
+
         return retval;
 }
 
 #ifdef CONFIG_PM
-static int mv_udc_suspend(struct device *_dev)
+static int mv_udc_suspend(struct device *dev)
 {
-        struct mv_udc *udc = the_controller;
+        struct mv_udc *udc;
+
+        udc = dev_get_drvdata(dev);
 
         /* if OTG is enabled, the following will be done in OTG driver*/
-        if (!IS_ERR_OR_NULL(udc->transceiver))
+        if (udc->transceiver)
                 return 0;
 
         if (udc->pdata->vbus && udc->pdata->vbus->poll)
@@ -2469,13 +2418,15 @@ static int mv_udc_suspend(struct device *_dev)
         return 0;
 }
 
-static int mv_udc_resume(struct device *_dev)
+static int mv_udc_resume(struct device *dev)
 {
-        struct mv_udc *udc = the_controller;
+        struct mv_udc *udc;
         int retval;
 
+        udc = dev_get_drvdata(dev);
+
         /* if OTG is enabled, the following will be done in OTG driver*/
-        if (!IS_ERR_OR_NULL(udc->transceiver))
+        if (udc->transceiver)
                 return 0;
 
         if (!udc->clock_gating) {
@@ -2499,11 +2450,12 @@ static const struct dev_pm_ops mv_udc_pm_ops = {
 };
 #endif
 
-static void mv_udc_shutdown(struct platform_device *dev)
+static void mv_udc_shutdown(struct platform_device *pdev)
 {
-        struct mv_udc *udc = the_controller;
+        struct mv_udc *udc;
         u32 mode;
 
+        udc = platform_get_drvdata(pdev);
         /* reset controller mode to IDLE */
         mv_udc_enable(udc);
         mode = readl(&udc->op_regs->usbmode);
@@ -2514,7 +2466,7 @@ static void mv_udc_shutdown(struct platform_device *dev)
 
 static struct platform_driver udc_driver = {
         .probe          = mv_udc_probe,
-        .remove         = __exit_p(mv_udc_remove),
+        .remove         = mv_udc_remove,
         .shutdown       = mv_udc_shutdown,
         .driver         = {
                 .owner  = THIS_MODULE,
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 708c0b55dcc8..a1b650e11339 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -116,6 +116,10 @@ static bool enable_suspend = 0;
 /* "modprobe net2280 enable_suspend=1" etc */
 module_param (enable_suspend, bool, S_IRUGO);
 
+/* force full-speed operation */
+static bool full_speed;
+module_param(full_speed, bool, 0444);
+MODULE_PARM_DESC(full_speed, "force full-speed mode -- for testing only!");
 
 #define DIR_STRING(bAddress) (((bAddress) & USB_DIR_IN) ? "in" : "out")
 
@@ -1899,6 +1903,10 @@ static int net2280_start(struct usb_gadget *_gadget,
         retval = device_create_file (&dev->pdev->dev, &dev_attr_queues);
         if (retval) goto err_func;
 
+        /* Enable force-full-speed testing mode, if desired */
+        if (full_speed)
+                writel(1 << FORCE_FULL_SPEED_MODE, &dev->usb->xcvrdiag);
+
         /* ... then enable host detection and ep0; and we're ready
          * for set_configuration as well as eventual disconnect.
          */
@@ -1957,6 +1965,10 @@ static int net2280_stop(struct usb_gadget *_gadget,
         dev->driver = NULL;
 
         net2280_led_active (dev, 0);
+
+        /* Disable full-speed test mode */
+        writel(0, &dev->usb->xcvrdiag);
+
         device_remove_file (&dev->pdev->dev, &dev_attr_function);
         device_remove_file (&dev->pdev->dev, &dev_attr_queues);
 
@@ -2841,6 +2853,9 @@ static void net2280_shutdown (struct pci_dev *pdev)
 
         /* disable the pullup so the host will think we're gone */
         writel (0, &dev->usb->usbctl);
+
+        /* Disable full-speed test mode */
+        writel(0, &dev->usb->xcvrdiag);
 }
 
 
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c
index 661600abace8..def37403989a 100644
--- a/drivers/usb/gadget/nokia.c
+++ b/drivers/usb/gadget/nokia.c
@@ -37,7 +37,7 @@
  * the runtime footprint, and giving us at least some parts of what
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
-#include "u_serial.c"
+#define USB_FACM_INCLUDED
 #include "f_acm.c"
 #include "f_ecm.c"
 #include "f_obex.c"
@@ -101,6 +101,15 @@ MODULE_LICENSE("GPL");
 
 static u8 hostaddr[ETH_ALEN];
 
+enum {
+        TTY_PORT_OBEX0,
+        TTY_PORT_OBEX1,
+        TTY_PORT_ACM,
+        TTY_PORTS_MAX,
+};
+
+static unsigned char tty_lines[TTY_PORTS_MAX];
+
 static int __init nokia_bind_config(struct usb_configuration *c)
 {
         int status = 0;
@@ -109,15 +118,15 @@ static int __init nokia_bind_config(struct usb_configuration *c)
         if (status)
                 printk(KERN_DEBUG "could not bind phonet config\n");
 
-        status = obex_bind_config(c, 0);
+        status = obex_bind_config(c, tty_lines[TTY_PORT_OBEX0]);
         if (status)
                 printk(KERN_DEBUG "could not bind obex config %d\n", 0);
 
-        status = obex_bind_config(c, 1);
+        status = obex_bind_config(c, tty_lines[TTY_PORT_OBEX1]);
         if (status)
                 printk(KERN_DEBUG "could not bind obex config %d\n", 0);
 
-        status = acm_bind_config(c, 2);
+        status = acm_bind_config(c, tty_lines[TTY_PORT_ACM]);
         if (status)
                 printk(KERN_DEBUG "could not bind acm config\n");
 
@@ -133,7 +142,7 @@ static struct usb_configuration nokia_config_500ma_driver = {
         .bConfigurationValue = 1,
         /* .iConfiguration = DYNAMIC */
         .bmAttributes   = USB_CONFIG_ATT_ONE,
-        .bMaxPower      = 250, /* 500mA */
+        .MaxPower       = 500,
 };
 
 static struct usb_configuration nokia_config_100ma_driver = {
@@ -141,21 +150,24 @@ static struct usb_configuration nokia_config_100ma_driver = {
         .bConfigurationValue = 2,
         /* .iConfiguration = DYNAMIC */
         .bmAttributes   = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
-        .bMaxPower      = 50, /* 100 mA */
+        .MaxPower       = 100,
 };
 
 static int __init nokia_bind(struct usb_composite_dev *cdev)
 {
         struct usb_gadget       *gadget = cdev->gadget;
         int                     status;
+        int                     cur_line;
 
         status = gphonet_setup(cdev->gadget);
         if (status < 0)
                 goto err_phonet;
 
-        status = gserial_setup(cdev->gadget, 3);
-        if (status < 0)
-                goto err_serial;
+        for (cur_line = 0; cur_line < TTY_PORTS_MAX; cur_line++) {
+                status = gserial_alloc_line(&tty_lines[cur_line]);
+                if (status)
+                        goto err_ether;
+        }
 
         status = gether_setup(cdev->gadget, hostaddr);
         if (status < 0)
@@ -192,8 +204,10 @@ static int __init nokia_bind(struct usb_composite_dev *cdev)
 err_usb:
         gether_cleanup();
 err_ether:
-        gserial_cleanup();
-err_serial:
+        cur_line--;
+        while (cur_line >= 0)
+                gserial_free_line(tty_lines[cur_line--]);
+
         gphonet_cleanup();
 err_phonet:
         return status;
@@ -201,8 +215,13 @@ err_phonet:
 
 static int __exit nokia_unbind(struct usb_composite_dev *cdev)
 {
+        int i;
+
         gphonet_cleanup();
-        gserial_cleanup();
+
+        for (i = 0; i < TTY_PORTS_MAX; i++)
+                gserial_free_line(tty_lines[i]);
+
         gether_cleanup();
 
         return 0;
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 8bfe990caf1a..06be85c2b233 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -1309,19 +1309,20 @@ static int omap_pullup(struct usb_gadget *gadget, int is_on)
         return 0;
 }
 
-static int omap_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int omap_udc_stop(struct usb_gadget_driver *driver);
+static int omap_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
+static int omap_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
 
-static struct usb_gadget_ops omap_gadget_ops = {
+static const struct usb_gadget_ops omap_gadget_ops = {
         .get_frame              = omap_get_frame,
         .wakeup                 = omap_wakeup,
         .set_selfpowered        = omap_set_selfpowered,
         .vbus_session           = omap_vbus_session,
         .vbus_draw              = omap_vbus_draw,
         .pullup                 = omap_pullup,
-        .start                  = omap_udc_start,
-        .stop                   = omap_udc_stop,
+        .udc_start              = omap_udc_start,
+        .udc_stop               = omap_udc_stop,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -2041,28 +2042,15 @@ static inline int machine_without_vbus_sense(void)
                 || cpu_is_omap7xx();
 }
 
-static int omap_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int omap_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
         int             status = -ENODEV;
         struct omap_ep  *ep;
         unsigned long   flags;
 
-        /* basic sanity tests */
-        if (!udc)
-                return -ENODEV;
-        if (!driver
-                        /* FIXME if otg, check:  driver->is_otg */
-                        || driver->max_speed < USB_SPEED_FULL
-                        || !bind || !driver->setup)
-                return -EINVAL;
 
         spin_lock_irqsave(&udc->lock, flags);
-        if (udc->driver) {
-                spin_unlock_irqrestore(&udc->lock, flags);
-                return -EBUSY;
-        }
-
         /* reset state */
         list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) {
                 ep->irqs = 0;
@@ -2084,15 +2072,6 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
         if (udc->dc_clk != NULL)
                 omap_udc_enable_clock(1);
 
-        status = bind(&udc->gadget, driver);
-        if (status) {
-                DBG("bind to %s --> %d\n", driver->driver.name, status);
-                udc->gadget.dev.driver = NULL;
-                udc->driver = NULL;
-                goto done;
-        }
-        DBG("bound to driver %s\n", driver->driver.name);
-
         omap_writew(UDC_IRQ_SRC_MASK, UDC_IRQ_SRC);
 
         /* connect to bus through transceiver */
@@ -2124,19 +2103,16 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
 done:
         if (udc->dc_clk != NULL)
                 omap_udc_enable_clock(0);
+
         return status;
 }
 
-static int omap_udc_stop(struct usb_gadget_driver *driver)
+static int omap_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
         unsigned long   flags;
         int             status = -ENODEV;
 
-        if (!udc)
-                return -ENODEV;
-        if (!driver || driver != udc->driver || !driver->unbind)
-                return -EINVAL;
-
         if (udc->dc_clk != NULL)
                 omap_udc_enable_clock(1);
 
@@ -2152,13 +2128,12 @@ static int omap_udc_stop(struct usb_gadget_driver *driver)
         udc_quiesce(udc);
         spin_unlock_irqrestore(&udc->lock, flags);
 
-        driver->unbind(&udc->gadget);
         udc->gadget.dev.driver = NULL;
         udc->driver = NULL;
 
         if (udc->dc_clk != NULL)
                 omap_udc_enable_clock(0);
-        DBG("unregistered driver '%s'\n", driver->driver.name);
+
         return status;
 }
 
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 6490c0040e3a..a787a8ef672b 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -375,6 +375,7 @@ struct pch_udc_dev {
         struct pch_udc_cfg_data         cfg_data;
         struct pch_vbus_gpio_data       vbus_gpio;
 };
+#define to_pch_udc(g)   (container_of((g), struct pch_udc_dev, gadget))
 
 #define PCH_UDC_PCI_BAR                 1
 #define PCI_DEVICE_ID_INTEL_EG20T_UDC   0x8808
@@ -384,7 +385,6 @@ struct pch_udc_dev {
 
 static const char       ep0_string[] = "ep0in";
 static DEFINE_SPINLOCK(udc_stall_spinlock);     /* stall spin lock */
-struct pch_udc_dev *pch_udc;            /* pointer to device object */
 static bool speed_fs;
 module_param_named(speed_fs, speed_fs, bool, S_IRUGO);
 MODULE_PARM_DESC(speed_fs, "true for Full speed operation");
@@ -1235,9 +1235,10 @@ static int pch_udc_pcd_vbus_draw(struct usb_gadget *gadget, unsigned int mA)
         return -EOPNOTSUPP;
 }
 
-static int pch_udc_start(struct usb_gadget_driver *driver,
-        int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int pch_udc_stop(struct usb_gadget_driver *driver);
+static int pch_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
+static int pch_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
 static const struct usb_gadget_ops pch_udc_ops = {
         .get_frame = pch_udc_pcd_get_frame,
         .wakeup = pch_udc_pcd_wakeup,
@@ -1245,8 +1246,8 @@ static const struct usb_gadget_ops pch_udc_ops = {
         .pullup = pch_udc_pcd_pullup,
         .vbus_session = pch_udc_pcd_vbus_session,
         .vbus_draw = pch_udc_pcd_vbus_draw,
-        .start  = pch_udc_start,
-        .stop   = pch_udc_stop,
+        .udc_start = pch_udc_start,
+        .udc_stop = pch_udc_stop,
 };
 
 /**
@@ -2981,40 +2982,15 @@ static int init_dma_pools(struct pch_udc_dev *dev)
         return 0;
 }
 
-static int pch_udc_start(struct usb_gadget_driver *driver,
-        int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int pch_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct pch_udc_dev      *dev = pch_udc;
-        int                     retval;
-
-        if (!driver || (driver->max_speed == USB_SPEED_UNKNOWN) || !bind ||
-            !driver->setup || !driver->unbind || !driver->disconnect) {
-                dev_err(&dev->pdev->dev,
-                        "%s: invalid driver parameter\n", __func__);
-                return -EINVAL;
-        }
+        struct pch_udc_dev      *dev = to_pch_udc(g);
 
-        if (!dev)
-                return -ENODEV;
-
-        if (dev->driver) {
-                dev_err(&dev->pdev->dev, "%s: already bound\n", __func__);
-                return -EBUSY;
-        }
         driver->driver.bus = NULL;
         dev->driver = driver;
         dev->gadget.dev.driver = &driver->driver;
 
-        /* Invoke the bind routine of the gadget driver */
-        retval = bind(&dev->gadget, driver);
-
-        if (retval) {
-                dev_err(&dev->pdev->dev, "%s: binding to %s returning %d\n",
-                       __func__, driver->driver.name, retval);
-                dev->driver = NULL;
-                dev->gadget.dev.driver = NULL;
-                return retval;
-        }
         /* get ready for ep0 traffic */
         pch_udc_setup_ep0(dev);
 
@@ -3026,30 +3002,21 @@ static int pch_udc_start(struct usb_gadget_driver *driver,
         return 0;
 }
 
-static int pch_udc_stop(struct usb_gadget_driver *driver)
+static int pch_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct pch_udc_dev      *dev = pch_udc;
-
-        if (!dev)
-                return -ENODEV;
-
-        if (!driver || (driver != dev->driver)) {
-                dev_err(&dev->pdev->dev,
-                        "%s: invalid driver parameter\n", __func__);
-                return -EINVAL;
-        }
+        struct pch_udc_dev      *dev = to_pch_udc(g);
 
         pch_udc_disable_interrupts(dev, UDC_DEVINT_MSK);
 
         /* Assures that there are no pending requests with this driver */
-        driver->disconnect(&dev->gadget);
-        driver->unbind(&dev->gadget);
         dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
         dev->connected = 0;
 
         /* set SD */
         pch_udc_set_disconnect(dev);
+
         return 0;
 }
 
@@ -3164,11 +3131,6 @@ static int pch_udc_probe(struct pci_dev *pdev,
         int                     retval;
         struct pch_udc_dev      *dev;
 
-        /* one udc only */
-        if (pch_udc) {
-                pr_err("%s: already probed\n", __func__);
-                return -EBUSY;
-        }
         /* init */
         dev = kzalloc(sizeof *dev, GFP_KERNEL);
         if (!dev) {
@@ -3207,7 +3169,6 @@ static int pch_udc_probe(struct pci_dev *pdev,
                 retval = -ENODEV;
                 goto finished;
         }
-        pch_udc = dev;
         /* initialize the hardware */
         if (pch_udc_pcd_init(dev)) {
                 retval = -ENODEV;
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index d52e869ce202..2bbcdce942dc 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -996,9 +996,10 @@ static int pxa25x_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
         return -EOPNOTSUPP;
 }
 
-static int pxa25x_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int pxa25x_stop(struct usb_gadget_driver *driver);
+static int pxa25x_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
+static int pxa25x_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
 
 static const struct usb_gadget_ops pxa25x_udc_ops = {
         .get_frame      = pxa25x_udc_get_frame,
@@ -1006,8 +1007,8 @@ static const struct usb_gadget_ops pxa25x_udc_ops = {
         .vbus_session   = pxa25x_udc_vbus_session,
         .pullup         = pxa25x_udc_pullup,
         .vbus_draw      = pxa25x_udc_vbus_draw,
-        .start          = pxa25x_start,
-        .stop           = pxa25x_stop,
+        .udc_start      = pxa25x_udc_start,
+        .udc_stop       = pxa25x_udc_stop,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1254,23 +1255,12 @@ static void udc_enable (struct pxa25x_udc *dev)
  * disconnect is reported.  then a host may connect again, or
  * the driver might get unbound.
  */
-static int pxa25x_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int pxa25x_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct pxa25x_udc       *dev = the_controller;
+        struct pxa25x_udc       *dev = to_pxa25x(g);
         int                     retval;
 
-        if (!driver
-                        || driver->max_speed < USB_SPEED_FULL
-                        || !bind
-                        || !driver->disconnect
-                        || !driver->setup)
-                return -EINVAL;
-        if (!dev)
-                return -ENODEV;
-        if (dev->driver)
-                return -EBUSY;
-
         /* first hook up the driver ... */
         dev->driver = driver;
         dev->gadget.dev.driver = &driver->driver;
@@ -1278,34 +1268,20 @@ static int pxa25x_start(struct usb_gadget_driver *driver,
 
         retval = device_add (&dev->gadget.dev);
         if (retval) {
-fail:
                 dev->driver = NULL;
                 dev->gadget.dev.driver = NULL;
                 return retval;
         }
-        retval = bind(&dev->gadget, driver);
-        if (retval) {
-                DMSG("bind to driver %s --> error %d\n",
-                                driver->driver.name, retval);
-                device_del (&dev->gadget.dev);
-                goto fail;
-        }
 
         /* ... then enable host detection and ep0; and we're ready
          * for set_configuration as well as eventual disconnect.
          */
-        DMSG("registered gadget driver '%s'\n", driver->driver.name);
-
         /* connect to bus through transceiver */
         if (!IS_ERR_OR_NULL(dev->transceiver)) {
                 retval = otg_set_peripheral(dev->transceiver->otg,
                                                 &dev->gadget);
-                if (retval) {
-                        DMSG("can't bind to transceiver\n");
-                        if (driver->unbind)
-                                driver->unbind(&dev->gadget);
+                if (retval)
                         goto bind_fail;
-                }
         }
 
         pullup(dev);
@@ -1334,22 +1310,14 @@ stop_activity(struct pxa25x_udc *dev, struct usb_gadget_driver *driver)
         }
         del_timer_sync(&dev->timer);
 
-        /* report disconnect; the driver is already quiesced */
-        if (driver)
-                driver->disconnect(&dev->gadget);
-
         /* re-init driver-visible data structures */
         udc_reinit(dev);
 }
 
-static int pxa25x_stop(struct usb_gadget_driver *driver)
+static int pxa25x_udc_stop(struct usb_gadget*g,
+                struct usb_gadget_driver *driver)
 {
-        struct pxa25x_udc       *dev = the_controller;
-
-        if (!dev)
-                return -ENODEV;
-        if (!driver || driver != dev->driver || !driver->unbind)
-                return -EINVAL;
+        struct pxa25x_udc       *dev = to_pxa25x(g);
 
         local_irq_disable();
         dev->pullup = 0;
@@ -1360,14 +1328,12 @@ static int pxa25x_stop(struct usb_gadget_driver *driver)
         if (!IS_ERR_OR_NULL(dev->transceiver))
                 (void) otg_set_peripheral(dev->transceiver->otg, NULL);
 
-        driver->unbind(&dev->gadget);
         dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
 
         device_del (&dev->gadget.dev);
-
-        DMSG("unregistered gadget driver '%s'\n", driver->driver.name);
         dump_state(dev);
+
         return 0;
 }
 
diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h
index 2eca1e71fecd..3fe5931dc21a 100644
--- a/drivers/usb/gadget/pxa25x_udc.h
+++ b/drivers/usb/gadget/pxa25x_udc.h
@@ -126,6 +126,7 @@ struct pxa25x_udc {
         struct dentry                           *debugfs_udc;
 #endif
 };
+#define to_pxa25x(g)    (container_of((g), struct pxa25x_udc, gadget))
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 2b3b01d5f403..f7d25795821a 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1671,9 +1671,10 @@ static int pxa_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
         return -EOPNOTSUPP;
 }
 
-static int pxa27x_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int pxa27x_udc_stop(struct usb_gadget_driver *driver);
+static int pxa27x_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
+static int pxa27x_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
 
 static const struct usb_gadget_ops pxa_udc_ops = {
         .get_frame      = pxa_udc_get_frame,
@@ -1681,8 +1682,8 @@ static const struct usb_gadget_ops pxa_udc_ops = {
         .pullup         = pxa_udc_pullup,
         .vbus_session   = pxa_udc_vbus_session,
         .vbus_draw      = pxa_udc_vbus_draw,
-        .start          = pxa27x_udc_start,
-        .stop           = pxa27x_udc_stop,
+        .udc_start      = pxa27x_udc_start,
+        .udc_stop       = pxa27x_udc_stop,
 };
 
 /**
@@ -1802,20 +1803,12 @@ static void udc_enable(struct pxa_udc *udc)
  *
  * Returns 0 if no error, -EINVAL, -ENODEV, -EBUSY otherwise
  */
-static int pxa27x_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int pxa27x_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct pxa_udc *udc = the_controller;
+        struct pxa_udc *udc = to_pxa(g);
         int retval;
 
-        if (!driver || driver->max_speed < USB_SPEED_FULL || !bind
-                        || !driver->disconnect || !driver->setup)
-                return -EINVAL;
-        if (!udc)
-                return -ENODEV;
-        if (udc->driver)
-                return -EBUSY;
-
         /* first hook up the driver ... */
         udc->driver = driver;
         udc->gadget.dev.driver = &driver->driver;
@@ -1824,23 +1817,14 @@ static int pxa27x_udc_start(struct usb_gadget_driver *driver,
         retval = device_add(&udc->gadget.dev);
         if (retval) {
                 dev_err(udc->dev, "device_add error %d\n", retval);
-                goto add_fail;
+                goto fail;
         }
-        retval = bind(&udc->gadget, driver);
-        if (retval) {
-                dev_err(udc->dev, "bind to driver %s --> error %d\n",
-                        driver->driver.name, retval);
-                goto bind_fail;
-        }
-        dev_dbg(udc->dev, "registered gadget driver '%s'\n",
-                driver->driver.name);
-
         if (!IS_ERR_OR_NULL(udc->transceiver)) {
                 retval = otg_set_peripheral(udc->transceiver->otg,
                                                 &udc->gadget);
                 if (retval) {
                         dev_err(udc->dev, "can't bind to transceiver\n");
-                        goto transceiver_fail;
+                        goto fail;
                 }
         }
 
@@ -1848,12 +1832,7 @@ static int pxa27x_udc_start(struct usb_gadget_driver *driver,
                 udc_enable(udc);
         return 0;
 
-transceiver_fail:
-        if (driver->unbind)
-                driver->unbind(&udc->gadget);
-bind_fail:
-        device_del(&udc->gadget.dev);
-add_fail:
+fail:
         udc->driver = NULL;
         udc->gadget.dev.driver = NULL;
         return retval;
@@ -1878,9 +1857,6 @@ static void stop_activity(struct pxa_udc *udc, struct usb_gadget_driver *driver)
 
         for (i = 0; i < NR_USB_ENDPOINTS; i++)
                 pxa_ep_disable(&udc->udc_usb_ep[i].usb_ep);
-
-        if (driver)
-                driver->disconnect(&udc->gadget);
 }
 
 /**
@@ -1889,25 +1865,18 @@ static void stop_activity(struct pxa_udc *udc, struct usb_gadget_driver *driver)
  *
  * Returns 0 if no error, -ENODEV, -EINVAL otherwise
  */
-static int pxa27x_udc_stop(struct usb_gadget_driver *driver)
+static int pxa27x_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct pxa_udc *udc = the_controller;
-
-        if (!udc)
-                return -ENODEV;
-        if (!driver || driver != udc->driver || !driver->unbind)
-                return -EINVAL;
+        struct pxa_udc *udc = to_pxa(g);
 
         stop_activity(udc, driver);
         udc_disable(udc);
         dplus_pullup(udc, 0);
 
-        driver->unbind(&udc->gadget);
         udc->driver = NULL;
 
         device_del(&udc->gadget.dev);
-        dev_info(udc->dev, "unregistered gadget driver '%s'\n",
-                 driver->driver.name);
 
         if (!IS_ERR_OR_NULL(udc->transceiver))
                 return otg_set_peripheral(udc->transceiver->otg, NULL);
diff --git a/drivers/usb/gadget/pxa27x_udc.h b/drivers/usb/gadget/pxa27x_udc.h
index 79d81a4b2344..28f2b53530f5 100644
--- a/drivers/usb/gadget/pxa27x_udc.h
+++ b/drivers/usb/gadget/pxa27x_udc.h
@@ -473,6 +473,7 @@ struct pxa_udc {
         struct dentry                           *debugfs_eps;
 #endif
 };
+#define to_pxa(g)       (container_of((g), struct pxa_udc, gadget))
 
 static inline struct pxa_udc *to_gadget_udc(struct usb_gadget *gadget)
 {
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index 9a9fadd9095f..f46a1b77ce3e 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1812,7 +1812,7 @@ static int r8a66597_set_selfpowered(struct usb_gadget *gadget, int is_self)
         return 0;
 }
 
-static struct usb_gadget_ops r8a66597_gadget_ops = {
+static const struct usb_gadget_ops r8a66597_gadget_ops = {
         .get_frame              = r8a66597_get_frame,
         .udc_start              = r8a66597_start,
         .udc_stop               = r8a66597_stop,
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index de80fa644b5a..c26564f29a2c 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -32,6 +32,7 @@
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/usb/phy.h>
 #include <linux/platform_data/s3c-hsotg.h>
 
 #include <mach/map.h>
@@ -133,7 +134,9 @@ struct s3c_hsotg_ep {
  * struct s3c_hsotg - driver state.
  * @dev: The parent device supplied to the probe function
  * @driver: USB gadget driver
- * @plat: The platform specific configuration data.
+ * @phy: The otg phy transceiver structure for phy control.
+ * @plat: The platform specific configuration data. This can be removed once
+ * all SoCs support usb transceiver.
  * @regs: The memory area mapped for accessing registers.
  * @irq: The IRQ number we are using
  * @supplies: Definition of USB power supplies
@@ -153,6 +156,7 @@ struct s3c_hsotg_ep {
 struct s3c_hsotg {
         struct device            *dev;
         struct usb_gadget_driver *driver;
+        struct usb_phy          *phy;
         struct s3c_hsotg_plat    *plat;
 
         spinlock_t              lock;
@@ -2854,7 +2858,10 @@ static void s3c_hsotg_phy_enable(struct s3c_hsotg *hsotg)
         struct platform_device *pdev = to_platform_device(hsotg->dev);
 
         dev_dbg(hsotg->dev, "pdev 0x%p\n", pdev);
-        if (hsotg->plat->phy_init)
+
+        if (hsotg->phy)
+                usb_phy_init(hsotg->phy);
+        else if (hsotg->plat->phy_init)
                 hsotg->plat->phy_init(pdev, hsotg->plat->phy_type);
 }
 
@@ -2869,7 +2876,9 @@ static void s3c_hsotg_phy_disable(struct s3c_hsotg *hsotg)
 {
         struct platform_device *pdev = to_platform_device(hsotg->dev);
 
-        if (hsotg->plat->phy_exit)
+        if (hsotg->phy)
+                usb_phy_shutdown(hsotg->phy);
+        else if (hsotg->plat->phy_exit)
                 hsotg->plat->phy_exit(pdev, hsotg->plat->phy_type);
 }
 
@@ -3055,7 +3064,7 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on)
         return 0;
 }
 
-static struct usb_gadget_ops s3c_hsotg_gadget_ops = {
+static const 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,
@@ -3492,6 +3501,7 @@ static void s3c_hsotg_release(struct device *dev)
 static int s3c_hsotg_probe(struct platform_device *pdev)
 {
         struct s3c_hsotg_plat *plat = pdev->dev.platform_data;
+        struct usb_phy *phy;
         struct device *dev = &pdev->dev;
         struct s3c_hsotg_ep *eps;
         struct s3c_hsotg *hsotg;
@@ -3500,20 +3510,27 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
         int ret;
         int i;
 
-        plat = pdev->dev.platform_data;
-        if (!plat) {
-                dev_err(&pdev->dev, "no platform data defined\n");
-                return -EINVAL;
-        }
-
         hsotg = devm_kzalloc(&pdev->dev, sizeof(struct s3c_hsotg), GFP_KERNEL);
         if (!hsotg) {
                 dev_err(dev, "cannot get memory\n");
                 return -ENOMEM;
         }
 
+        phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+        if (IS_ERR_OR_NULL(phy)) {
+                /* Fallback for pdata */
+                plat = pdev->dev.platform_data;
+                if (!plat) {
+                        dev_err(&pdev->dev, "no platform data or transceiver defined\n");
+                        return -EPROBE_DEFER;
+                } else {
+                        hsotg->plat = plat;
+                }
+        } else {
+                hsotg->phy = phy;
+        }
+
         hsotg->dev = dev;
-        hsotg->plat = plat;
 
         hsotg->clk = devm_clk_get(&pdev->dev, "otg");
         if (IS_ERR(hsotg->clk)) {
@@ -3571,7 +3588,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
         for (i = 0; i < ARRAY_SIZE(hsotg->supplies); i++)
                 hsotg->supplies[i].supply = s3c_hsotg_supply_names[i];
 
-        ret = regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies),
+        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies),
                                  hsotg->supplies);
         if (ret) {
                 dev_err(dev, "failed to request supplies: %d\n", ret);
@@ -3661,8 +3678,6 @@ err_ep_mem:
         kfree(eps);
 err_supplies:
         s3c_hsotg_phy_disable(hsotg);
-        regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
-
 err_clk:
         clk_disable_unprepare(hsotg->clk);
 
@@ -3687,7 +3702,6 @@ static int s3c_hsotg_remove(struct platform_device *pdev)
         }
 
         s3c_hsotg_phy_disable(hsotg);
-        regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
 
         clk_disable_unprepare(hsotg->clk);
 
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 94ca33bb990b..458965a1b138 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -435,7 +435,7 @@ static void s3c_hsudc_epin_intr(struct s3c_hsudc *hsudc, u32 ep_idx)
         struct s3c_hsudc_req *hsreq;
         u32 csr;
 
-        csr = readl((u32)hsudc->regs + S3C_ESR);
+        csr = readl(hsudc->regs + S3C_ESR);
         if (csr & S3C_ESR_STALL) {
                 writel(S3C_ESR_STALL, hsudc->regs + S3C_ESR);
                 return;
@@ -468,7 +468,7 @@ static void s3c_hsudc_epout_intr(struct s3c_hsudc *hsudc, u32 ep_idx)
         struct s3c_hsudc_req *hsreq;
         u32 csr;
 
-        csr = readl((u32)hsudc->regs + S3C_ESR);
+        csr = readl(hsudc->regs + S3C_ESR);
         if (csr & S3C_ESR_STALL) {
                 writel(S3C_ESR_STALL, hsudc->regs + S3C_ESR);
                 return;
@@ -901,12 +901,12 @@ static int s3c_hsudc_queue(struct usb_ep *_ep, struct usb_request *_req,
         if (list_empty(&hsep->queue) && !hsep->stopped) {
                 offset = (ep_index(hsep)) ? S3C_ESR : S3C_EP0SR;
                 if (ep_is_in(hsep)) {
-                        csr = readl((u32)hsudc->regs + offset);
+                        csr = readl(hsudc->regs + offset);
                         if (!(csr & S3C_ESR_TX_SUCCESS) &&
                                 (s3c_hsudc_write_fifo(hsep, hsreq) == 1))
                                 hsreq = NULL;
                 } else {
-                        csr = readl((u32)hsudc->regs + offset);
+                        csr = readl(hsudc->regs + offset);
                         if ((csr & S3C_ESR_RX_SUCCESS)
                                    && (s3c_hsudc_read_fifo(hsep, hsreq) == 1))
                                 hsreq = NULL;
@@ -1254,7 +1254,7 @@ static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
         return -EOPNOTSUPP;
 }
 
-static struct usb_gadget_ops s3c_hsudc_gadget_ops = {
+static const struct usb_gadget_ops s3c_hsudc_gadget_ops = {
         .get_frame      = s3c_hsudc_gadget_getframe,
         .udc_start      = s3c_hsudc_start,
         .udc_stop       = s3c_hsudc_stop,
@@ -1286,7 +1286,7 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
         for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++)
                 hsudc->supplies[i].supply = s3c_hsudc_supply_names[i];
 
-        ret = regulator_bulk_get(dev, ARRAY_SIZE(hsudc->supplies),
+        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(hsudc->supplies),
                                  hsudc->supplies);
         if (ret != 0) {
                 dev_err(dev, "failed to request supplies: %d\n", ret);
@@ -1366,7 +1366,6 @@ err_res:
         if (!IS_ERR_OR_NULL(hsudc->transceiver))
                 usb_put_phy(hsudc->transceiver);
 
-        regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
 err_supplies:
         return ret;
 }
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index a2fa6e16d019..fc07b4381286 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1538,9 +1538,10 @@ static int s3c2410_vbus_draw(struct usb_gadget *_gadget, unsigned ma)
         return -ENOTSUPP;
 }
 
-static int s3c2410_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *));
-static int s3c2410_udc_stop(struct usb_gadget_driver *driver);
+static int s3c2410_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
+static int s3c2410_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver);
 
 static const struct usb_gadget_ops s3c2410_ops = {
         .get_frame              = s3c2410_udc_get_frame,
@@ -1549,8 +1550,8 @@ static const struct usb_gadget_ops s3c2410_ops = {
         .pullup                 = s3c2410_udc_pullup,
         .vbus_session           = s3c2410_udc_vbus_session,
         .vbus_draw              = s3c2410_vbus_draw,
-        .start                  = s3c2410_udc_start,
-        .stop                   = s3c2410_udc_stop,
+        .udc_start              = s3c2410_udc_start,
+        .udc_stop               = s3c2410_udc_stop,
 };
 
 static void s3c2410_udc_command(enum s3c2410_udc_cmd_e cmd)
@@ -1664,33 +1665,14 @@ static void s3c2410_udc_enable(struct s3c2410_udc *dev)
         s3c2410_udc_command(S3C2410_UDC_P_ENABLE);
 }
 
-static int s3c2410_udc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
+static int s3c2410_udc_start(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct s3c2410_udc *udc = the_controller;
+        struct s3c2410_udc *udc = to_s3c2410(g)
         int             retval;
 
         dprintk(DEBUG_NORMAL, "%s() '%s'\n", __func__, driver->driver.name);
 
-        /* Sanity checks */
-        if (!udc)
-                return -ENODEV;
-
-        if (udc->driver)
-                return -EBUSY;
-
-        if (!bind || !driver->setup || driver->max_speed < USB_SPEED_FULL) {
-                dev_err(&udc->gadget.dev, "Invalid driver: bind %p setup %p speed %d\n",
-                        bind, driver->setup, driver->max_speed);
-                return -EINVAL;
-        }
-#if defined(MODULE)
-        if (!driver->unbind) {
-                dev_err(&udc->gadget.dev, "Invalid driver: no unbind method\n");
-                return -EINVAL;
-        }
-#endif
-
         /* Hook the driver */
         udc->driver = driver;
         udc->gadget.dev.driver = &driver->driver;
@@ -1702,15 +1684,6 @@ static int s3c2410_udc_start(struct usb_gadget_driver *driver,
                 goto register_error;
         }
 
-        dprintk(DEBUG_NORMAL, "binding gadget driver '%s'\n",
-                driver->driver.name);
-
-        retval = bind(&udc->gadget, driver);
-        if (retval) {
-                device_del(&udc->gadget.dev);
-                goto register_error;
-        }
-
         /* Enable udc */
         s3c2410_udc_enable(udc);
 
@@ -1722,24 +1695,10 @@ register_error:
         return retval;
 }
 
-static int s3c2410_udc_stop(struct usb_gadget_driver *driver)
+static int s3c2410_udc_stop(struct usb_gadget *g,
+                struct usb_gadget_driver *driver)
 {
-        struct s3c2410_udc *udc = the_controller;
-
-        if (!udc)
-                return -ENODEV;
-
-        if (!driver || driver != udc->driver || !driver->unbind)
-                return -EINVAL;
-
-        dprintk(DEBUG_NORMAL, "usb_gadget_unregister_driver() '%s'\n",
-                driver->driver.name);
-
-        /* report disconnect */
-        if (driver->disconnect)
-                driver->disconnect(&udc->gadget);
-
-        driver->unbind(&udc->gadget);
+        struct s3c2410_udc *udc = to_s3c2410(g);
 
         device_del(&udc->gadget.dev);
         udc->driver = NULL;
diff --git a/drivers/usb/gadget/s3c2410_udc.h b/drivers/usb/gadget/s3c2410_udc.h
index 3e80fd5c820f..93bf225f1969 100644
--- a/drivers/usb/gadget/s3c2410_udc.h
+++ b/drivers/usb/gadget/s3c2410_udc.h
@@ -95,5 +95,6 @@ struct s3c2410_udc {
         u8                              vbus;
         struct dentry                   *regs_info;
 };
+#define to_s3c2410(g)   (container_of((g), struct s3c2410_udc, gadget))
 
 #endif
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 44752f531e85..68d7bb06ebcb 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -36,10 +36,8 @@
  * the runtime footprint, and giving us at least some parts of what
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
-#include "f_acm.c"
 #include "f_obex.c"
 #include "f_serial.c"
-#include "u_serial.c"
 
 /*-------------------------------------------------------------------------*/
 USB_GADGET_COMPOSITE_OPTIONS();
@@ -128,20 +126,25 @@ module_param(n_ports, uint, 0);
 MODULE_PARM_DESC(n_ports, "number of ports to create, default=1");
 
 /*-------------------------------------------------------------------------*/
+static unsigned char tty_lines[MAX_U_SERIAL_PORTS];
 
-static int __init serial_bind_config(struct usb_configuration *c)
+static int __init serial_bind_obex_config(struct usb_configuration *c)
 {
         unsigned i;
         int status = 0;
 
-        for (i = 0; i < n_ports && status == 0; i++) {
-                if (use_acm)
-                        status = acm_bind_config(c, i);
-                else if (use_obex)
-                        status = obex_bind_config(c, i);
-                else
-                        status = gser_bind_config(c, i);
-        }
+        for (i = 0; i < n_ports && status == 0; i++)
+                status = obex_bind_config(c, tty_lines[i]);
+        return status;
+}
+
+static int __init serial_bind_gser_config(struct usb_configuration *c)
+{
+        unsigned i;
+        int status = 0;
+
+        for (i = 0; i < n_ports && status == 0; i++)
+                status = gser_bind_config(c, tty_lines[i]);
         return status;
 }
 
@@ -152,13 +155,70 @@ static struct usb_configuration serial_config_driver = {
         .bmAttributes   = USB_CONFIG_ATT_SELFPOWER,
 };
 
+static struct usb_function_instance *fi_serial[MAX_U_SERIAL_PORTS];
+static struct usb_function *f_serial[MAX_U_SERIAL_PORTS];
+
+static int serial_register_ports(struct usb_composite_dev *cdev,
+                struct usb_configuration *c, const char *f_name)
+{
+        int i;
+        int ret;
+
+        ret = usb_add_config_only(cdev, c);
+        if (ret)
+                goto out;
+
+        for (i = 0; i < n_ports; i++) {
+                struct f_serial_opts *opts;
+
+                fi_serial[i] = usb_get_function_instance(f_name);
+                if (IS_ERR(fi_serial[i])) {
+                        ret = PTR_ERR(fi_serial[i]);
+                        goto fail;
+                }
+                opts = container_of(fi_serial[i], struct f_serial_opts, func_inst);
+                opts->port_num = tty_lines[i];
+
+                f_serial[i] = usb_get_function(fi_serial[i]);
+                if (IS_ERR(f_serial[i])) {
+                        ret = PTR_ERR(f_serial[i]);
+                        goto err_get_func;
+                }
+
+                ret = usb_add_function(c, f_serial[i]);
+                if (ret)
+                        goto err_add_func;
+        }
+
+        return 0;
+
+err_add_func:
+        usb_put_function(f_serial[i]);
+err_get_func:
+        usb_put_function_instance(fi_serial[i]);
+
+fail:
+        i--;
+        while (i >= 0) {
+                usb_remove_function(c, f_serial[i]);
+                usb_put_function(f_serial[i]);
+                usb_put_function_instance(fi_serial[i]);
+                i--;
+        }
+out:
+        return ret;
+}
+
 static int __init gs_bind(struct usb_composite_dev *cdev)
 {
         int                     status;
+        int                     cur_line;
 
-        status = gserial_setup(cdev->gadget, n_ports);
-        if (status < 0)
-                return status;
+        for (cur_line = 0; cur_line < n_ports; cur_line++) {
+                status = gserial_alloc_line(&tty_lines[cur_line]);
+                if (status)
+                        goto fail;
+        }
 
         /* Allocate string descriptor numbers ... note that string
          * contents can be overridden by the composite_dev glue.
@@ -178,8 +238,16 @@ static int __init gs_bind(struct usb_composite_dev *cdev)
         }
 
         /* register our configuration */
-        status = usb_add_config(cdev, &serial_config_driver,
-                        serial_bind_config);
+        if (use_acm) {
+                status  = serial_register_ports(cdev, &serial_config_driver,
+                                "acm");
+                usb_ep_autoconfig_reset(cdev->gadget);
+        } else if (use_obex)
+                status = usb_add_config(cdev, &serial_config_driver,
+                                serial_bind_obex_config);
+        else
+                status = usb_add_config(cdev, &serial_config_driver,
+                                serial_bind_gser_config);
         if (status < 0)
                 goto fail;
 
@@ -189,16 +257,31 @@ static int __init gs_bind(struct usb_composite_dev *cdev)
         return 0;
 
 fail:
-        gserial_cleanup();
+        cur_line--;
+        while (cur_line >= 0)
+                gserial_free_line(tty_lines[cur_line--]);
         return status;
 }
 
+static int gs_unbind(struct usb_composite_dev *cdev)
+{
+        int i;
+
+        for (i = 0; i < n_ports; i++) {
+                usb_put_function(f_serial[i]);
+                usb_put_function_instance(fi_serial[i]);
+                gserial_free_line(tty_lines[i]);
+        }
+        return 0;
+}
+
 static __refdata struct usb_composite_driver gserial_driver = {
         .name           = "g_serial",
         .dev            = &device_desc,
         .strings        = dev_strings,
         .max_speed      = USB_SPEED_SUPER,
         .bind           = gs_bind,
+        .unbind         = gs_unbind,
 };
 
 static int __init init(void)
@@ -234,6 +317,5 @@ module_init(init);
 static void __exit cleanup(void)
 {
         usb_composite_unregister(&gserial_driver);
-        gserial_cleanup();
 }
 module_exit(cleanup);
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 0e3ae43454a2..4ecbf8496f48 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -93,18 +93,6 @@
 
 /*-------------------------------------------------------------------------*/
 
-/* CBI Interrupt data structure */
-struct interrupt_data {
-        u8      bType;
-        u8      bValue;
-};
-
-#define CBI_INTERRUPT_DATA_LEN          2
-
-/* CBI Accept Device-Specific Command request */
-#define USB_CBI_ADSC_REQUEST            0x00
-
-
 /* Length of a SCSI Command Data Block */
 #define MAX_COMMAND_SIZE        16
 
@@ -385,41 +373,6 @@ static struct usb_ss_ep_comp_descriptor fsg_ss_bulk_out_comp_desc = {
         /*.bMaxBurst =          DYNAMIC, */
 };
 
-static __maybe_unused struct usb_ext_cap_descriptor fsg_ext_cap_desc = {
-        .bLength =              USB_DT_USB_EXT_CAP_SIZE,
-        .bDescriptorType =      USB_DT_DEVICE_CAPABILITY,
-        .bDevCapabilityType =   USB_CAP_TYPE_EXT,
-
-        .bmAttributes =         cpu_to_le32(USB_LPM_SUPPORT),
-};
-
-static __maybe_unused struct usb_ss_cap_descriptor fsg_ss_cap_desc = {
-        .bLength =              USB_DT_USB_SS_CAP_SIZE,
-        .bDescriptorType =      USB_DT_DEVICE_CAPABILITY,
-        .bDevCapabilityType =   USB_SS_CAP_TYPE,
-
-        /* .bmAttributes = LTM is not supported yet */
-
-        .wSpeedSupported =      cpu_to_le16(USB_LOW_SPEED_OPERATION
-                | USB_FULL_SPEED_OPERATION
-                | USB_HIGH_SPEED_OPERATION
-                | USB_5GBPS_OPERATION),
-        .bFunctionalitySupport = USB_LOW_SPEED_OPERATION,
-        .bU1devExitLat =        USB_DEFAULT_U1_DEV_EXIT_LAT,
-        .bU2DevExitLat =        cpu_to_le16(USB_DEFAULT_U2_DEV_EXIT_LAT),
-};
-
-static __maybe_unused struct usb_bos_descriptor fsg_bos_desc = {
-        .bLength =              USB_DT_BOS_SIZE,
-        .bDescriptorType =      USB_DT_BOS,
-
-        .wTotalLength =         cpu_to_le16(USB_DT_BOS_SIZE
-                                + USB_DT_USB_EXT_CAP_SIZE
-                                + USB_DT_USB_SS_CAP_SIZE),
-
-        .bNumDeviceCaps =       2,
-};
-
 static struct usb_descriptor_header *fsg_ss_function[] = {
         (struct usb_descriptor_header *) &fsg_intf_desc,
         (struct usb_descriptor_header *) &fsg_ss_bulk_in_desc,
@@ -429,20 +382,6 @@ static struct usb_descriptor_header *fsg_ss_function[] = {
         NULL,
 };
 
-/* Maxpacket and other transfer characteristics vary by speed. */
-static __maybe_unused struct usb_endpoint_descriptor *
-fsg_ep_desc(struct usb_gadget *g, struct usb_endpoint_descriptor *fs,
-                struct usb_endpoint_descriptor *hs,
-                struct usb_endpoint_descriptor *ss)
-{
-        if (gadget_is_superspeed(g) && g->speed == USB_SPEED_SUPER)
-                return ss;
-        else if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
-                return hs;
-        return fs;
-}
-
-
 /* Static strings, in UTF-8 (for simplicity we use only ASCII characters) */
 static struct usb_string                fsg_strings[] = {
         {FSG_STRING_INTERFACE,          fsg_string_interface},
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index 598dcc1212f0..588a9be18ef8 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -26,6 +26,7 @@
 #include <linux/tty_flip.h>
 #include <linux/slab.h>
 #include <linux/export.h>
+#include <linux/module.h>
 
 #include "u_serial.h"
 
@@ -35,11 +36,12 @@
  * "serial port" functionality through the USB gadget stack.  Each such
  * port is exposed through a /dev/ttyGS* node.
  *
- * After initialization (gserial_setup), these TTY port devices stay
- * available until they are removed (gserial_cleanup).  Each one may be
- * connected to a USB function (gserial_connect), or disconnected (with
- * gserial_disconnect) when the USB host issues a config change event.
- * Data can only flow when the port is connected to the host.
+ * After this module has been loaded, the individual TTY port can be requested
+ * (gserial_alloc_line()) and it will stay available until they are removed
+ * (gserial_free_line()). Each one may be connected to a USB function
+ * (gserial_connect), or disconnected (with gserial_disconnect) when the USB
+ * host issues a config change event. Data can only flow when the port is
+ * connected to the host.
  *
  * A given TTY port can be made available in multiple configurations.
  * For example, each one might expose a ttyGS0 node which provides a
@@ -119,13 +121,10 @@ struct gs_port {
         struct usb_cdc_line_coding port_line_coding;    /* 8-N-1 etc */
 };
 
-/* increase N_PORTS if you need more */
-#define N_PORTS         4
 static struct portmaster {
         struct mutex    lock;                   /* protect open/close */
         struct gs_port  *port;
-} ports[N_PORTS];
-static unsigned n_ports;
+} ports[MAX_U_SERIAL_PORTS];
 
 #define GS_CLOSE_TIMEOUT                15              /* seconds */
 
@@ -309,6 +308,7 @@ gs_alloc_req(struct usb_ep *ep, unsigned len, gfp_t kmalloc_flags)
 
         return req;
 }
+EXPORT_SYMBOL_GPL(gs_alloc_req);
 
 /*
  * gs_free_req
@@ -320,6 +320,7 @@ void gs_free_req(struct usb_ep *ep, struct usb_request *req)
         kfree(req->buf);
         usb_ep_free_request(ep, req);
 }
+EXPORT_SYMBOL_GPL(gs_free_req);
 
 /*
  * gs_send_packet
@@ -1030,10 +1031,19 @@ static int
 gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding)
 {
         struct gs_port  *port;
+        int             ret = 0;
+
+        mutex_lock(&ports[port_num].lock);
+        if (ports[port_num].port) {
+                ret = -EBUSY;
+                goto out;
+        }
 
         port = kzalloc(sizeof(struct gs_port), GFP_KERNEL);
-        if (port == NULL)
-                return -ENOMEM;
+        if (port == NULL) {
+                ret = -ENOMEM;
+                goto out;
+        }
 
         tty_port_init(&port->port);
         spin_lock_init(&port->port_lock);
@@ -1049,109 +1059,9 @@ gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding)
         port->port_line_coding = *coding;
 
         ports[port_num].port = port;
-
-        return 0;
-}
-
-/**
- * gserial_setup - initialize TTY driver for one or more ports
- * @g: gadget to associate with these ports
- * @count: how many ports to support
- * Context: may sleep
- *
- * The TTY stack needs to know in advance how many devices it should
- * plan to manage.  Use this call to set up the ports you will be
- * exporting through USB.  Later, connect them to functions based
- * on what configuration is activated by the USB host; and disconnect
- * them as appropriate.
- *
- * An example would be a two-configuration device in which both
- * configurations expose port 0, but through different functions.
- * One configuration could even expose port 1 while the other
- * one doesn't.
- *
- * Returns negative errno or zero.
- */
-int gserial_setup(struct usb_gadget *g, unsigned count)
-{
-        unsigned                        i;
-        struct usb_cdc_line_coding      coding;
-        int                             status;
-
-        if (count == 0 || count > N_PORTS)
-                return -EINVAL;
-
-        gs_tty_driver = alloc_tty_driver(count);
-        if (!gs_tty_driver)
-                return -ENOMEM;
-
-        gs_tty_driver->driver_name = "g_serial";
-        gs_tty_driver->name = PREFIX;
-        /* uses dynamically assigned dev_t values */
-
-        gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        gs_tty_driver->subtype = SERIAL_TYPE_NORMAL;
-        gs_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        gs_tty_driver->init_termios = tty_std_termios;
-
-        /* 9600-8-N-1 ... matches defaults expected by "usbser.sys" on
-         * MS-Windows.  Otherwise, most of these flags shouldn't affect
-         * anything unless we were to actually hook up to a serial line.
-         */
-        gs_tty_driver->init_termios.c_cflag =
-                        B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        gs_tty_driver->init_termios.c_ispeed = 9600;
-        gs_tty_driver->init_termios.c_ospeed = 9600;
-
-        coding.dwDTERate = cpu_to_le32(9600);
-        coding.bCharFormat = 8;
-        coding.bParityType = USB_CDC_NO_PARITY;
-        coding.bDataBits = USB_CDC_1_STOP_BITS;
-
-        tty_set_operations(gs_tty_driver, &gs_tty_ops);
-
-        /* make devices be openable */
-        for (i = 0; i < count; i++) {
-                mutex_init(&ports[i].lock);
-                status = gs_port_alloc(i, &coding);
-                if (status) {
-                        count = i;
-                        goto fail;
-                }
-        }
-        n_ports = count;
-
-        /* export the driver ... */
-        status = tty_register_driver(gs_tty_driver);
-        if (status) {
-                pr_err("%s: cannot register, err %d\n",
-                                __func__, status);
-                goto fail;
-        }
-
-        /* ... and sysfs class devices, so mdev/udev make /dev/ttyGS* */
-        for (i = 0; i < count; i++) {
-                struct device   *tty_dev;
-
-                tty_dev = tty_port_register_device(&ports[i].port->port,
-                                gs_tty_driver, i, &g->dev);
-                if (IS_ERR(tty_dev))
-                        pr_warning("%s: no classdev for port %d, err %ld\n",
-                                __func__, i, PTR_ERR(tty_dev));
-        }
-
-        pr_debug("%s: registered %d ttyGS* device%s\n", __func__,
-                        count, (count == 1) ? "" : "s");
-
-        return status;
-fail:
-        while (count--) {
-                tty_port_destroy(&ports[count].port->port);
-                kfree(ports[count].port);
-        }
-        put_tty_driver(gs_tty_driver);
-        gs_tty_driver = NULL;
-        return status;
+out:
+        mutex_unlock(&ports[port_num].lock);
+        return ret;
 }
 
 static int gs_closed(struct gs_port *port)
@@ -1164,55 +1074,77 @@ static int gs_closed(struct gs_port *port)
         return cond;
 }
 
-/**
- * gserial_cleanup - remove TTY-over-USB driver and devices
- * Context: may sleep
- *
- * This is called to free all resources allocated by @gserial_setup().
- * Accordingly, it may need to wait until some open /dev/ files have
- * closed.
- *
- * The caller must have issued @gserial_disconnect() for any ports
- * that had previously been connected, so that there is never any
- * I/O pending when it's called.
- */
-void gserial_cleanup(void)
+static void gserial_free_port(struct gs_port *port)
+{
+        tasklet_kill(&port->push);
+        /* wait for old opens to finish */
+        wait_event(port->port.close_wait, gs_closed(port));
+        WARN_ON(port->port_usb != NULL);
+        tty_port_destroy(&port->port);
+        kfree(port);
+}
+
+void gserial_free_line(unsigned char port_num)
 {
-        unsigned        i;
         struct gs_port  *port;
 
-        if (!gs_tty_driver)
+        mutex_lock(&ports[port_num].lock);
+        if (WARN_ON(!ports[port_num].port)) {
+                mutex_unlock(&ports[port_num].lock);
                 return;
+        }
+        port = ports[port_num].port;
+        ports[port_num].port = NULL;
+        mutex_unlock(&ports[port_num].lock);
 
-        /* start sysfs and /dev/ttyGS* node removal */
-        for (i = 0; i < n_ports; i++)
-                tty_unregister_device(gs_tty_driver, i);
-
-        for (i = 0; i < n_ports; i++) {
-                /* prevent new opens */
-                mutex_lock(&ports[i].lock);
-                port = ports[i].port;
-                ports[i].port = NULL;
-                mutex_unlock(&ports[i].lock);
-
-                tasklet_kill(&port->push);
+        gserial_free_port(port);
+        tty_unregister_device(gs_tty_driver, port_num);
+}
+EXPORT_SYMBOL_GPL(gserial_free_line);
 
-                /* wait for old opens to finish */
-                wait_event(port->port.close_wait, gs_closed(port));
+int gserial_alloc_line(unsigned char *line_num)
+{
+        struct usb_cdc_line_coding      coding;
+        struct device                   *tty_dev;
+        int                             ret;
+        int                             port_num;
 
-                WARN_ON(port->port_usb != NULL);
+        coding.dwDTERate = cpu_to_le32(9600);
+        coding.bCharFormat = 8;
+        coding.bParityType = USB_CDC_NO_PARITY;
+        coding.bDataBits = USB_CDC_1_STOP_BITS;
 
-                tty_port_destroy(&port->port);
-                kfree(port);
+        for (port_num = 0; port_num < MAX_U_SERIAL_PORTS; port_num++) {
+                ret = gs_port_alloc(port_num, &coding);
+                if (ret == -EBUSY)
+                        continue;
+                if (ret)
+                        return ret;
+                break;
         }
-        n_ports = 0;
+        if (ret)
+                return ret;
 
-        tty_unregister_driver(gs_tty_driver);
-        put_tty_driver(gs_tty_driver);
-        gs_tty_driver = NULL;
+        /* ... and sysfs class devices, so mdev/udev make /dev/ttyGS* */
+
+        tty_dev = tty_port_register_device(&ports[port_num].port->port,
+                        gs_tty_driver, port_num, NULL);
+        if (IS_ERR(tty_dev)) {
+                struct gs_port  *port;
+                pr_err("%s: failed to register tty for port %d, err %ld\n",
+                                __func__, port_num, PTR_ERR(tty_dev));
 
-        pr_debug("%s: cleaned up ttyGS* support\n", __func__);
+                ret = PTR_ERR(tty_dev);
+                port = ports[port_num].port;
+                ports[port_num].port = NULL;
+                gserial_free_port(port);
+                goto err;
+        }
+        *line_num = port_num;
+err:
+        return ret;
 }
+EXPORT_SYMBOL_GPL(gserial_alloc_line);
 
 /**
  * gserial_connect - notify TTY I/O glue that USB link is active
@@ -1229,8 +1161,8 @@ void gserial_cleanup(void)
  *
  * Caller needs to have set up the endpoints and USB function in @dev
  * before calling this, as well as the appropriate (speed-specific)
- * endpoint descriptors, and also have set up the TTY driver by calling
- * @gserial_setup().
+ * endpoint descriptors, and also have allocate @port_num by calling
+ * @gserial_alloc_line().
  *
  * Returns negative errno or zero.
  * On success, ep->driver_data will be overwritten.
@@ -1241,11 +1173,18 @@ int gserial_connect(struct gserial *gser, u8 port_num)
         unsigned long   flags;
         int             status;
 
-        if (!gs_tty_driver || port_num >= n_ports)
+        if (port_num >= MAX_U_SERIAL_PORTS)
                 return -ENXIO;
 
-        /* we "know" gserial_cleanup() hasn't been called */
         port = ports[port_num].port;
+        if (!port) {
+                pr_err("serial line %d not allocated.\n", port_num);
+                return -EINVAL;
+        }
+        if (port->port_usb) {
+                pr_err("serial line %d is in use.\n", port_num);
+                return -EBUSY;
+        }
 
         /* activate the endpoints */
         status = usb_ep_enable(gser->in);
@@ -1292,7 +1231,7 @@ fail_out:
         gser->in->driver_data = NULL;
         return status;
 }
-
+EXPORT_SYMBOL_GPL(gserial_connect);
 /**
  * gserial_disconnect - notify TTY I/O glue that USB link is inactive
  * @gser: the function, on which gserial_connect() was called
@@ -1347,3 +1286,65 @@ void gserial_disconnect(struct gserial *gser)
 
         spin_unlock_irqrestore(&port->port_lock, flags);
 }
+EXPORT_SYMBOL_GPL(gserial_disconnect);
+
+static int userial_init(void)
+{
+        unsigned                        i;
+        int                             status;
+
+        gs_tty_driver = alloc_tty_driver(MAX_U_SERIAL_PORTS);
+        if (!gs_tty_driver)
+                return -ENOMEM;
+
+        gs_tty_driver->driver_name = "g_serial";
+        gs_tty_driver->name = PREFIX;
+        /* uses dynamically assigned dev_t values */
+
+        gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
+        gs_tty_driver->subtype = SERIAL_TYPE_NORMAL;
+        gs_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+        gs_tty_driver->init_termios = tty_std_termios;
+
+        /* 9600-8-N-1 ... matches defaults expected by "usbser.sys" on
+         * MS-Windows.  Otherwise, most of these flags shouldn't affect
+         * anything unless we were to actually hook up to a serial line.
+         */
+        gs_tty_driver->init_termios.c_cflag =
+                        B9600 | CS8 | CREAD | HUPCL | CLOCAL;
+        gs_tty_driver->init_termios.c_ispeed = 9600;
+        gs_tty_driver->init_termios.c_ospeed = 9600;
+
+        tty_set_operations(gs_tty_driver, &gs_tty_ops);
+        for (i = 0; i < MAX_U_SERIAL_PORTS; i++)
+                mutex_init(&ports[i].lock);
+
+        /* export the driver ... */
+        status = tty_register_driver(gs_tty_driver);
+        if (status) {
+                pr_err("%s: cannot register, err %d\n",
+                                __func__, status);
+                goto fail;
+        }
+
+        pr_debug("%s: registered %d ttyGS* device%s\n", __func__,
+                        MAX_U_SERIAL_PORTS,
+                        (MAX_U_SERIAL_PORTS == 1) ? "" : "s");
+
+        return status;
+fail:
+        put_tty_driver(gs_tty_driver);
+        gs_tty_driver = NULL;
+        return status;
+}
+module_init(userial_init);
+
+static void userial_cleanup(void)
+{
+        tty_unregister_driver(gs_tty_driver);
+        put_tty_driver(gs_tty_driver);
+        gs_tty_driver = NULL;
+}
+module_exit(userial_cleanup);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/gadget/u_serial.h b/drivers/usb/gadget/u_serial.h
index 9b0fe6450fbf..66ce73a00509 100644
--- a/drivers/usb/gadget/u_serial.h
+++ b/drivers/usb/gadget/u_serial.h
@@ -15,6 +15,13 @@
 #include <linux/usb/composite.h>
 #include <linux/usb/cdc.h>
 
+#define MAX_U_SERIAL_PORTS      4
+
+struct f_serial_opts {
+        struct usb_function_instance func_inst;
+        u8 port_num;
+};
+
 /*
  * One non-multiplexed "serial" I/O port ... there can be several of these
  * on any given USB peripheral device, if it provides enough endpoints.
@@ -49,9 +56,9 @@ struct gserial {
 struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned len, gfp_t flags);
 void gs_free_req(struct usb_ep *, struct usb_request *req);
 
-/* port setup/teardown is handled by gadget driver */
-int gserial_setup(struct usb_gadget *g, unsigned n_ports);
-void gserial_cleanup(void);
+/* management of individual TTY ports */
+int gserial_alloc_line(unsigned char *port_line);
+void gserial_free_line(unsigned char port_line);
 
 /* connect/disconnect is handled by individual functions */
 int gserial_connect(struct gserial *, u8 port_num);
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index 4d90a800063c..2a9cd369f71c 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -102,28 +102,6 @@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
 /* ------------------------------------------------------------------------- */
 
 /**
- * usb_gadget_start - tells usb device controller to start up
- * @gadget: The gadget we want to get started
- * @driver: The driver we want to bind to @gadget
- * @bind: The bind function for @driver
- *
- * This call is issued by the UDC Class driver when it's about
- * to register a gadget driver to the device controller, before
- * calling gadget driver's bind() method.
- *
- * It allows the controller to be powered off until strictly
- * necessary to have it powered on.
- *
- * Returns zero on success, else negative errno.
- */
-static inline int usb_gadget_start(struct usb_gadget *gadget,
-                struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
-{
-        return gadget->ops->start(driver, bind);
-}
-
-/**
  * usb_gadget_udc_start - tells usb device controller to start up
  * @gadget: The gadget we want to get started
  * @driver: The driver we want to bind to @gadget
@@ -144,24 +122,6 @@ static inline int usb_gadget_udc_start(struct usb_gadget *gadget,
 }
 
 /**
- * usb_gadget_stop - tells usb device controller we don't need it anymore
- * @gadget: The device we want to stop activity
- * @driver: The driver to unbind from @gadget
- *
- * This call is issued by the UDC Class driver after calling
- * gadget driver's unbind() method.
- *
- * The details are implementation specific, but it can go as
- * far as powering off UDC completely and disable its data
- * line pullups.
- */
-static inline void usb_gadget_stop(struct usb_gadget *gadget,
-                struct usb_gadget_driver *driver)
-{
-        gadget->ops->stop(driver);
-}
-
-/**
  * usb_gadget_udc_stop - tells usb device controller we don't need it anymore
  * @gadget: The device we want to stop activity
  * @driver: The driver to unbind from @gadget
@@ -246,14 +206,6 @@ err1:
 }
 EXPORT_SYMBOL_GPL(usb_add_gadget_udc);
 
-static int udc_is_newstyle(struct usb_udc *udc)
-{
-        if (udc->gadget->ops->udc_start && udc->gadget->ops->udc_stop)
-                return 1;
-        return 0;
-}
-
-
 static void usb_gadget_remove_driver(struct usb_udc *udc)
 {
         dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n",
@@ -261,14 +213,10 @@ static void usb_gadget_remove_driver(struct usb_udc *udc)
 
         kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
 
-        if (udc_is_newstyle(udc)) {
-                usb_gadget_disconnect(udc->gadget);
-                udc->driver->disconnect(udc->gadget);
-                udc->driver->unbind(udc->gadget);
-                usb_gadget_udc_stop(udc->gadget, udc->driver);
-        } else {
-                usb_gadget_stop(udc->gadget, udc->driver);
-        }
+        usb_gadget_disconnect(udc->gadget);
+        udc->driver->disconnect(udc->gadget);
+        udc->driver->unbind(udc->gadget);
+        usb_gadget_udc_stop(udc->gadget, udc->driver);
 
         udc->driver = NULL;
         udc->dev.driver = NULL;
@@ -311,6 +259,62 @@ EXPORT_SYMBOL_GPL(usb_del_gadget_udc);
 
 /* ------------------------------------------------------------------------- */
 
+static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *driver)
+{
+        int ret;
+
+        dev_dbg(&udc->dev, "registering UDC driver [%s]\n",
+                        driver->function);
+
+        udc->driver = driver;
+        udc->dev.driver = &driver->driver;
+
+        ret = driver->bind(udc->gadget, driver);
+        if (ret)
+                goto err1;
+        ret = usb_gadget_udc_start(udc->gadget, driver);
+        if (ret) {
+                driver->unbind(udc->gadget);
+                goto err1;
+        }
+        usb_gadget_connect(udc->gadget);
+
+        kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
+        return 0;
+err1:
+        dev_err(&udc->dev, "failed to start %s: %d\n",
+                        udc->driver->function, ret);
+        udc->driver = NULL;
+        udc->dev.driver = NULL;
+        return ret;
+}
+
+int udc_attach_driver(const char *name, struct usb_gadget_driver *driver)
+{
+        struct usb_udc *udc = NULL;
+        int ret = -ENODEV;
+
+        mutex_lock(&udc_lock);
+        list_for_each_entry(udc, &udc_list, list) {
+                ret = strcmp(name, dev_name(&udc->dev));
+                if (!ret)
+                        break;
+        }
+        if (ret) {
+                ret = -ENODEV;
+                goto out;
+        }
+        if (udc->driver) {
+                ret = -EBUSY;
+                goto out;
+        }
+        ret = udc_bind_to_driver(udc, driver);
+out:
+        mutex_unlock(&udc_lock);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(udc_attach_driver);
+
 int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
 {
         struct usb_udc          *udc = NULL;
@@ -329,41 +333,8 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
         pr_debug("couldn't find an available UDC\n");
         mutex_unlock(&udc_lock);
         return -ENODEV;
-
 found:
-        dev_dbg(&udc->dev, "registering UDC driver [%s]\n",
-                        driver->function);
-
-        udc->driver = driver;
-        udc->dev.driver = &driver->driver;
-
-        if (udc_is_newstyle(udc)) {
-                ret = driver->bind(udc->gadget, driver);
-                if (ret)
-                        goto err1;
-                ret = usb_gadget_udc_start(udc->gadget, driver);
-                if (ret) {
-                        driver->unbind(udc->gadget);
-                        goto err1;
-                }
-                usb_gadget_connect(udc->gadget);
-        } else {
-
-                ret = usb_gadget_start(udc->gadget, driver, driver->bind);
-                if (ret)
-                        goto err1;
-
-        }
-
-        kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
-        mutex_unlock(&udc_lock);
-        return 0;
-
-err1:
-        dev_err(&udc->dev, "failed to start %s: %d\n",
-                        udc->driver->function, ret);
-        udc->driver = NULL;
-        udc->dev.driver = NULL;
+        ret = udc_bind_to_driver(udc, driver);
         mutex_unlock(&udc_lock);
         return ret;
 }
@@ -410,13 +381,11 @@ static ssize_t usb_udc_softconn_store(struct device *dev,
         struct usb_udc          *udc = container_of(dev, struct usb_udc, dev);
 
         if (sysfs_streq(buf, "connect")) {
-                if (udc_is_newstyle(udc))
-                        usb_gadget_udc_start(udc->gadget, udc->driver);
+                usb_gadget_udc_start(udc->gadget, udc->driver);
                 usb_gadget_connect(udc->gadget);
         } else if (sysfs_streq(buf, "disconnect")) {
                 usb_gadget_disconnect(udc->gadget);
-                if (udc_is_newstyle(udc))
-                        usb_gadget_udc_stop(udc->gadget, udc->driver);
+                usb_gadget_udc_stop(udc->gadget, udc->driver);
         } else {
                 dev_err(dev, "unsupported command '%s'\n", buf);
                 return -EINVAL;
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c
index 69cf5c2cd335..8cef1e658c29 100644
--- a/drivers/usb/gadget/webcam.c
+++ b/drivers/usb/gadget/webcam.c
@@ -336,7 +336,7 @@ static struct usb_configuration webcam_config_driver = {
         .bConfigurationValue    = 1,
         .iConfiguration         = 0, /* dynamic */
         .bmAttributes           = USB_CONFIG_ATT_SELFPOWER,
-        .bMaxPower              = CONFIG_USB_GADGET_VBUS_DRAW / 2,
+        .MaxPower               = CONFIG_USB_GADGET_VBUS_DRAW,
 };
 
 static int /* __init_or_exit */
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 6bf4c0611365..685fa681cb65 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -10,7 +10,6 @@
  * (at your option) any later version.
  */
 
-
 /*
  * Gadget Zero only needs two bulk endpoints, and is an example of how you
  * can write a hardware-agnostic gadget driver running inside a USB device.
@@ -43,23 +42,11 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/device.h>
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/usb/composite.h>
 
 #include "g_zero.h"
-#include "gadget_chips.h"
-
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * Kbuild is not very cooperative with respect to linking separately
- * compiled library objects into one module.  So for now we won't use
- * separate compilation ... ensuring init/exit sections work to shrink
- * the runtime footprint, and giving us at least some parts of what
- * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
- */
-#include "f_sourcesink.c"
-#include "f_loopback.c"
-
 /*-------------------------------------------------------------------------*/
 USB_GADGET_COMPOSITE_OPTIONS();
 
@@ -67,9 +54,6 @@ USB_GADGET_COMPOSITE_OPTIONS();
 
 static const char longname[] = "Gadget Zero";
 
-unsigned buflen = 4096;         /* only used for bulk endpoints */
-module_param(buflen, uint, 0);
-
 /*
  * Normally the "loopback" configuration is second (index 1) so
  * it's not the default.  Here's where to change that order, to
@@ -79,6 +63,13 @@ module_param(buflen, uint, 0);
 static bool loopdefault = 0;
 module_param(loopdefault, bool, S_IRUGO|S_IWUSR);
 
+static struct usb_zero_options gzero_options = {
+        .isoc_interval = 4,
+        .isoc_maxpacket = 1024,
+        .bulk_buflen = 4096,
+        .qlen = 32,
+};
+
 /*-------------------------------------------------------------------------*/
 
 /* Thanks to NetChip Technologies for donating this product ID.
@@ -129,20 +120,27 @@ static struct usb_otg_descriptor otg_descriptor = {
         .bmAttributes =         USB_OTG_SRP | USB_OTG_HNP,
 };
 
-const struct usb_descriptor_header *otg_desc[] = {
+static const struct usb_descriptor_header *otg_desc[] = {
         (struct usb_descriptor_header *) &otg_descriptor,
         NULL,
 };
+#else
+#define otg_desc        NULL
 #endif
 
 /* string IDs are assigned dynamically */
 /* default serial number takes at least two packets */
 static char serial[] = "0123456789.0123456789.0123456789";
 
+#define USB_GZERO_SS_DESC       (USB_GADGET_FIRST_AVAIL_IDX + 0)
+#define USB_GZERO_LB_DESC       (USB_GADGET_FIRST_AVAIL_IDX + 1)
+
 static struct usb_string strings_dev[] = {
         [USB_GADGET_MANUFACTURER_IDX].s = "",
         [USB_GADGET_PRODUCT_IDX].s = longname,
         [USB_GADGET_SERIAL_IDX].s = serial,
+        [USB_GZERO_SS_DESC].s   = "source and sink data",
+        [USB_GZERO_LB_DESC].s   = "loop input to output",
         {  }                    /* end of list */
 };
 
@@ -158,58 +156,6 @@ static struct usb_gadget_strings *dev_strings[] = {
 
 /*-------------------------------------------------------------------------*/
 
-struct usb_request *alloc_ep_req(struct usb_ep *ep, int len)
-{
-        struct usb_request      *req;
-
-        req = usb_ep_alloc_request(ep, GFP_ATOMIC);
-        if (req) {
-                if (len)
-                        req->length = len;
-                else
-                        req->length = buflen;
-                req->buf = kmalloc(req->length, GFP_ATOMIC);
-                if (!req->buf) {
-                        usb_ep_free_request(ep, req);
-                        req = NULL;
-                }
-        }
-        return req;
-}
-
-void free_ep_req(struct usb_ep *ep, struct usb_request *req)
-{
-        kfree(req->buf);
-        usb_ep_free_request(ep, req);
-}
-
-static void disable_ep(struct usb_composite_dev *cdev, struct usb_ep *ep)
-{
-        int                     value;
-
-        if (ep->driver_data) {
-                value = usb_ep_disable(ep);
-                if (value < 0)
-                        DBG(cdev, "disable %s --> %d\n",
-                                        ep->name, value);
-                ep->driver_data = NULL;
-        }
-}
-
-void disable_endpoints(struct usb_composite_dev *cdev,
-                struct usb_ep *in, struct usb_ep *out,
-                struct usb_ep *iso_in, struct usb_ep *iso_out)
-{
-        disable_ep(cdev, in);
-        disable_ep(cdev, out);
-        if (iso_in)
-                disable_ep(cdev, iso_in);
-        if (iso_out)
-                disable_ep(cdev, iso_out);
-}
-
-/*-------------------------------------------------------------------------*/
-
 static struct timer_list        autoresume_timer;
 
 static void zero_autoresume(unsigned long _c)
@@ -251,8 +197,65 @@ static void zero_resume(struct usb_composite_dev *cdev)
 
 /*-------------------------------------------------------------------------*/
 
+static struct usb_configuration loopback_driver = {
+        .label          = "loopback",
+        .bConfigurationValue = 2,
+        .bmAttributes   = USB_CONFIG_ATT_SELFPOWER,
+        /* .iConfiguration = DYNAMIC */
+};
+
+static struct usb_function *func_ss;
+static struct usb_function_instance *func_inst_ss;
+
+static int ss_config_setup(struct usb_configuration *c,
+                const struct usb_ctrlrequest *ctrl)
+{
+        switch (ctrl->bRequest) {
+        case 0x5b:
+        case 0x5c:
+                return func_ss->setup(func_ss, ctrl);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+static struct usb_configuration sourcesink_driver = {
+        .label                  = "source/sink",
+        .setup                  = ss_config_setup,
+        .bConfigurationValue    = 3,
+        .bmAttributes           = USB_CONFIG_ATT_SELFPOWER,
+        /* .iConfiguration      = DYNAMIC */
+};
+
+module_param_named(buflen, gzero_options.bulk_buflen, uint, 0);
+module_param_named(pattern, gzero_options.pattern, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(pattern, "0 = all zeroes, 1 = mod63, 2 = none");
+
+module_param_named(isoc_interval, gzero_options.isoc_interval, uint,
+                S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(isoc_interval, "1 - 16");
+
+module_param_named(isoc_maxpacket, gzero_options.isoc_maxpacket, uint,
+                S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(isoc_maxpacket, "0 - 1023 (fs), 0 - 1024 (hs/ss)");
+
+module_param_named(isoc_mult, gzero_options.isoc_mult, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(isoc_mult, "0 - 2 (hs/ss only)");
+
+module_param_named(isoc_maxburst, gzero_options.isoc_maxburst, uint,
+                S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(isoc_maxburst, "0 - 15 (ss only)");
+
+static struct usb_function *func_lb;
+static struct usb_function_instance *func_inst_lb;
+
+module_param_named(qlen, gzero_options.qlen, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(qlen, "depth of loopback queue");
+
 static int __init zero_bind(struct usb_composite_dev *cdev)
 {
+        struct f_ss_opts        *ss_opts;
+        struct f_lb_opts        *lb_opts;
         int                     status;
 
         /* Allocate string descriptor numbers ... note that string
@@ -268,27 +271,105 @@ static int __init zero_bind(struct usb_composite_dev *cdev)
 
         setup_timer(&autoresume_timer, zero_autoresume, (unsigned long) cdev);
 
+        func_inst_ss = usb_get_function_instance("SourceSink");
+        if (IS_ERR(func_inst_ss))
+                return PTR_ERR(func_inst_ss);
+
+        ss_opts =  container_of(func_inst_ss, struct f_ss_opts, func_inst);
+        ss_opts->pattern = gzero_options.pattern;
+        ss_opts->isoc_interval = gzero_options.isoc_interval;
+        ss_opts->isoc_maxpacket = gzero_options.isoc_maxpacket;
+        ss_opts->isoc_mult = gzero_options.isoc_mult;
+        ss_opts->isoc_maxburst = gzero_options.isoc_maxpacket;
+        ss_opts->bulk_buflen = gzero_options.bulk_buflen;
+
+        func_ss = usb_get_function(func_inst_ss);
+        if (IS_ERR(func_ss))
+                goto err_put_func_inst_ss;
+
+        func_inst_lb = usb_get_function_instance("Loopback");
+        if (IS_ERR(func_inst_lb))
+                goto err_put_func_ss;
+
+        lb_opts = container_of(func_inst_lb, struct f_lb_opts, func_inst);
+        lb_opts->bulk_buflen = gzero_options.bulk_buflen;
+        lb_opts->qlen = gzero_options.qlen;
+
+        func_lb = usb_get_function(func_inst_lb);
+        if (IS_ERR(func_lb)) {
+                status = PTR_ERR(func_lb);
+                goto err_put_func_inst_lb;
+        }
+
+        sourcesink_driver.iConfiguration = strings_dev[USB_GZERO_SS_DESC].id;
+        loopback_driver.iConfiguration = strings_dev[USB_GZERO_LB_DESC].id;
+
+        /* support autoresume for remote wakeup testing */
+        sourcesink_driver.bmAttributes &= ~USB_CONFIG_ATT_WAKEUP;
+        loopback_driver.bmAttributes &= ~USB_CONFIG_ATT_WAKEUP;
+        sourcesink_driver.descriptors = NULL;
+        loopback_driver.descriptors = NULL;
+        if (autoresume) {
+                sourcesink_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+                loopback_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+        }
+
+        /* support OTG systems */
+        if (gadget_is_otg(cdev->gadget)) {
+                sourcesink_driver.descriptors = otg_desc;
+                sourcesink_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+                loopback_driver.descriptors = otg_desc;
+                loopback_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+        }
+
         /* Register primary, then secondary configuration.  Note that
          * SH3 only allows one config...
          */
         if (loopdefault) {
-                loopback_add(cdev, autoresume != 0);
-                sourcesink_add(cdev, autoresume != 0);
+                usb_add_config_only(cdev, &loopback_driver);
+                usb_add_config_only(cdev, &sourcesink_driver);
         } else {
-                sourcesink_add(cdev, autoresume != 0);
-                loopback_add(cdev, autoresume != 0);
+                usb_add_config_only(cdev, &sourcesink_driver);
+                usb_add_config_only(cdev, &loopback_driver);
         }
+        status = usb_add_function(&sourcesink_driver, func_ss);
+        if (status)
+                goto err_conf_flb;
+
+        usb_ep_autoconfig_reset(cdev->gadget);
+        status = usb_add_function(&loopback_driver, func_lb);
+        if (status)
+                goto err_conf_flb;
 
+        usb_ep_autoconfig_reset(cdev->gadget);
         usb_composite_overwrite_options(cdev, &coverwrite);
 
         INFO(cdev, "%s, version: " DRIVER_VERSION "\n", longname);
 
         return 0;
+
+err_conf_flb:
+        usb_put_function(func_lb);
+        func_lb = NULL;
+err_put_func_inst_lb:
+        usb_put_function_instance(func_inst_lb);
+        func_inst_lb = NULL;
+err_put_func_ss:
+        usb_put_function(func_ss);
+        func_ss = NULL;
+err_put_func_inst_ss:
+        usb_put_function_instance(func_inst_ss);
+        func_inst_ss = NULL;
+        return status;
 }
 
 static int zero_unbind(struct usb_composite_dev *cdev)
 {
         del_timer_sync(&autoresume_timer);
+        if (!IS_ERR_OR_NULL(func_ss))
+                usb_put_function(func_ss);
+        if (!IS_ERR_OR_NULL(func_lb))
+                usb_put_function(func_lb);
         return 0;
 }
 
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 3a21c5d683c0..c59a1126926f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -246,7 +246,7 @@ config USB_EHCI_ATH79
 
 config USB_OXU210HP_HCD
         tristate "OXU210HP HCD support"
-        depends on USB
+        depends on USB && GENERIC_HARDIRQS
         ---help---
           The OXU210HP is an USB host/OTG/device controller. Enable this
           option if your board has this chip. If unsure, say N.
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 6c56297ea16b..3065809546b1 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -302,7 +302,6 @@ static int mv_ehci_remove(struct platform_device *pdev)
 {
         struct ehci_hcd_mv *ehci_mv = platform_get_drvdata(pdev);
         struct usb_hcd *hcd = ehci_mv->hcd;
-        int clk_i;
 
         if (hcd->rh_registered)
                 usb_remove_hcd(hcd);
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index e2004de6ad3d..e9301fb97eaa 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -57,7 +57,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
         struct usb_hcd *hcd;
         struct resource *res;
         int irq, ret;
-        unsigned int flags;
         struct ehci_mxc_priv *priv;
         struct device *dev = &pdev->dev;
         struct ehci_hcd *ehci;
@@ -162,25 +161,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
         if (ret)
                 goto err_add;
 
-        if (pdata->otg) {
-                /*
-                 * efikamx and efikasb have some hardware bug which is
-                 * preventing usb to work unless CHRGVBUS is set.
-                 * It's in violation of USB specs
-                 */
-                if (machine_is_mx51_efikamx() || machine_is_mx51_efikasb()) {
-                        flags = usb_phy_io_read(pdata->otg,
-                                                        ULPI_OTG_CTRL);
-                        flags |= ULPI_OTG_CTRL_CHRGVBUS;
-                        ret = usb_phy_io_write(pdata->otg, flags,
-                                                        ULPI_OTG_CTRL);
-                        if (ret) {
-                                dev_err(dev, "unable to set CHRVBUS\n");
-                                goto err_add;
-                        }
-                }
-        }
-
         return 0;
 
 err_add:
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index ac17a7c3a0cd..99899e808c6a 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -288,7 +288,6 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
 {
         struct device *dev                              = &pdev->dev;
         struct usb_hcd *hcd                             = dev_get_drvdata(dev);
-        struct ehci_hcd_omap_platform_data *pdata       = dev->platform_data;
 
         usb_remove_hcd(hcd);
         disable_put_regulator(dev->platform_data);
@@ -298,13 +297,6 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
         pm_runtime_put_sync(dev);
         pm_runtime_disable(dev);
 
-        if (pdata->phy_reset) {
-                if (gpio_is_valid(pdata->reset_gpio_port[0]))
-                        gpio_free(pdata->reset_gpio_port[0]);
-
-                if (gpio_is_valid(pdata->reset_gpio_port[1]))
-                        gpio_free(pdata->reset_gpio_port[1]);
-        }
         return 0;
 }
 
@@ -372,7 +364,7 @@ static const struct hc_driver ehci_omap_hc_driver = {
         .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
 };
 
-MODULE_ALIAS("platform:omap-ehci");
+MODULE_ALIAS("platform:ehci-omap");
 MODULE_AUTHOR("Texas Instruments, Inc.");
 MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
 
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 319dcfaa8735..20ebf6a8b7f4 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -17,6 +17,8 @@
 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_data/usb-ehci-s5p.h>
+#include <linux/usb/phy.h>
+#include <linux/usb/samsung_usb_phy.h>
 #include <plat/usb-phy.h>
 
 #define EHCI_INSNREG00(base)                    (base + 0x90)
@@ -32,6 +34,9 @@ struct s5p_ehci_hcd {
         struct device *dev;
         struct usb_hcd *hcd;
         struct clk *clk;
+        struct usb_phy *phy;
+        struct usb_otg *otg;
+        struct s5p_ehci_platdata *pdata;
 };
 
 static const struct hc_driver s5p_ehci_hc_driver = {
@@ -65,6 +70,26 @@ static const struct hc_driver s5p_ehci_hc_driver = {
         .clear_tt_buffer_complete       = ehci_clear_tt_buffer_complete,
 };
 
+static void s5p_ehci_phy_enable(struct s5p_ehci_hcd *s5p_ehci)
+{
+        struct platform_device *pdev = to_platform_device(s5p_ehci->dev);
+
+        if (s5p_ehci->phy)
+                usb_phy_init(s5p_ehci->phy);
+        else if (s5p_ehci->pdata->phy_init)
+                s5p_ehci->pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
+}
+
+static void s5p_ehci_phy_disable(struct s5p_ehci_hcd *s5p_ehci)
+{
+        struct platform_device *pdev = to_platform_device(s5p_ehci->dev);
+
+        if (s5p_ehci->phy)
+                usb_phy_shutdown(s5p_ehci->phy);
+        else if (s5p_ehci->pdata->phy_exit)
+                s5p_ehci->pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
+}
+
 static void s5p_setup_vbus_gpio(struct platform_device *pdev)
 {
         int err;
@@ -87,20 +112,15 @@ static u64 ehci_s5p_dma_mask = DMA_BIT_MASK(32);
 
 static int s5p_ehci_probe(struct platform_device *pdev)
 {
-        struct s5p_ehci_platdata *pdata;
+        struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
         struct s5p_ehci_hcd *s5p_ehci;
         struct usb_hcd *hcd;
         struct ehci_hcd *ehci;
         struct resource *res;
+        struct usb_phy *phy;
         int irq;
         int err;
 
-        pdata = pdev->dev.platform_data;
-        if (!pdata) {
-                dev_err(&pdev->dev, "No platform data defined\n");
-                return -EINVAL;
-        }
-
         /*
          * Right now device-tree probed devices don't get dma_mask set.
          * Since shared usb code relies on it, set it here for now.
@@ -118,6 +138,20 @@ static int s5p_ehci_probe(struct platform_device *pdev)
         if (!s5p_ehci)
                 return -ENOMEM;
 
+        phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
+        if (IS_ERR_OR_NULL(phy)) {
+                /* Fallback to pdata */
+                if (!pdata) {
+                        dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
+                        return -EPROBE_DEFER;
+                } else {
+                        s5p_ehci->pdata = pdata;
+                }
+        } else {
+                s5p_ehci->phy = phy;
+                s5p_ehci->otg = phy->otg;
+        }
+
         s5p_ehci->dev = &pdev->dev;
 
         hcd = usb_create_hcd(&s5p_ehci_hc_driver, &pdev->dev,
@@ -163,8 +197,10 @@ static int s5p_ehci_probe(struct platform_device *pdev)
                 goto fail_io;
         }
 
-        if (pdata->phy_init)
-                pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+        if (s5p_ehci->otg)
+                s5p_ehci->otg->set_host(s5p_ehci->otg, &s5p_ehci->hcd->self);
+
+        s5p_ehci_phy_enable(s5p_ehci);
 
         ehci = hcd_to_ehci(hcd);
         ehci->caps = hcd->regs;
@@ -175,13 +211,15 @@ static int s5p_ehci_probe(struct platform_device *pdev)
         err = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (err) {
                 dev_err(&pdev->dev, "Failed to add USB HCD\n");
-                goto fail_io;
+                goto fail_add_hcd;
         }
 
         platform_set_drvdata(pdev, s5p_ehci);
 
         return 0;
 
+fail_add_hcd:
+        s5p_ehci_phy_disable(s5p_ehci);
 fail_io:
         clk_disable_unprepare(s5p_ehci->clk);
 fail_clk:
@@ -191,14 +229,15 @@ fail_clk:
 
 static int s5p_ehci_remove(struct platform_device *pdev)
 {
-        struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
         struct s5p_ehci_hcd *s5p_ehci = platform_get_drvdata(pdev);
         struct usb_hcd *hcd = s5p_ehci->hcd;
 
         usb_remove_hcd(hcd);
 
-        if (pdata && pdata->phy_exit)
-                pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+        if (s5p_ehci->otg)
+                s5p_ehci->otg->set_host(s5p_ehci->otg, &s5p_ehci->hcd->self);
+
+        s5p_ehci_phy_disable(s5p_ehci);
 
         clk_disable_unprepare(s5p_ehci->clk);
 
@@ -222,14 +261,14 @@ static int s5p_ehci_suspend(struct device *dev)
         struct s5p_ehci_hcd *s5p_ehci = dev_get_drvdata(dev);
         struct usb_hcd *hcd = s5p_ehci->hcd;
         bool do_wakeup = device_may_wakeup(dev);
-        struct platform_device *pdev = to_platform_device(dev);
-        struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
         int rc;
 
         rc = ehci_suspend(hcd, do_wakeup);
 
-        if (pdata && pdata->phy_exit)
-                pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+        if (s5p_ehci->otg)
+                s5p_ehci->otg->set_host(s5p_ehci->otg, &s5p_ehci->hcd->self);
+
+        s5p_ehci_phy_disable(s5p_ehci);
 
         clk_disable_unprepare(s5p_ehci->clk);
 
@@ -240,13 +279,13 @@ static int s5p_ehci_resume(struct device *dev)
 {
         struct s5p_ehci_hcd *s5p_ehci = dev_get_drvdata(dev);
         struct usb_hcd *hcd = s5p_ehci->hcd;
-        struct platform_device *pdev = to_platform_device(dev);
-        struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
 
         clk_prepare_enable(s5p_ehci->clk);
 
-        if (pdata && pdata->phy_init)
-                pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+        if (s5p_ehci->otg)
+                s5p_ehci->otg->set_host(s5p_ehci->otg, &s5p_ehci->hcd->self);
+
+        s5p_ehci_phy_enable(s5p_ehci);
 
         /* DMA burst Enable */
         writel(EHCI_INSNREG00_ENABLE_DMA_BURST, EHCI_INSNREG00(hcd->regs));
@@ -266,7 +305,7 @@ static const struct dev_pm_ops s5p_ehci_pm_ops = {
 
 #ifdef CONFIG_OF
 static const struct of_device_id exynos_ehci_match[] = {
-        { .compatible = "samsung,exynos-ehci" },
+        { .compatible = "samsung,exynos4210-ehci" },
         {},
 };
 MODULE_DEVICE_TABLE(of, exynos_ehci_match);
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index a35bbddf8968..125e261f5bfc 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -932,7 +932,7 @@ static void enqueue_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh)
         }
 }
 
-void schedule_ptds(struct usb_hcd *hcd)
+static void schedule_ptds(struct usb_hcd *hcd)
 {
         struct isp1760_hcd *priv;
         struct isp1760_qh *qh, *qh_next;
@@ -1285,7 +1285,7 @@ leave:
 #define SLOT_CHECK_PERIOD 200
 static struct timer_list errata2_timer;
 
-void errata2_function(unsigned long data)
+static void errata2_function(unsigned long data)
 {
         struct usb_hcd *hcd = (struct usb_hcd *) data;
         struct isp1760_hcd *priv = hcd_to_priv(hcd);
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index aa3b8844bb9f..e3b7e85120e4 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -15,14 +15,39 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/usb-exynos.h>
+#include <linux/usb/phy.h>
+#include <linux/usb/samsung_usb_phy.h>
 #include <plat/usb-phy.h>
 
 struct exynos_ohci_hcd {
         struct device *dev;
         struct usb_hcd *hcd;
         struct clk *clk;
+        struct usb_phy *phy;
+        struct usb_otg *otg;
+        struct exynos4_ohci_platdata *pdata;
 };
 
+static void exynos_ohci_phy_enable(struct exynos_ohci_hcd *exynos_ohci)
+{
+        struct platform_device *pdev = to_platform_device(exynos_ohci->dev);
+
+        if (exynos_ohci->phy)
+                usb_phy_init(exynos_ohci->phy);
+        else if (exynos_ohci->pdata->phy_init)
+                exynos_ohci->pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
+}
+
+static void exynos_ohci_phy_disable(struct exynos_ohci_hcd *exynos_ohci)
+{
+        struct platform_device *pdev = to_platform_device(exynos_ohci->dev);
+
+        if (exynos_ohci->phy)
+                usb_phy_shutdown(exynos_ohci->phy);
+        else if (exynos_ohci->pdata->phy_exit)
+                exynos_ohci->pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
+}
+
 static int ohci_exynos_reset(struct usb_hcd *hcd)
 {
         return ohci_init(hcd_to_ohci(hcd));
@@ -78,20 +103,15 @@ static u64 ohci_exynos_dma_mask = DMA_BIT_MASK(32);
 
 static int exynos_ohci_probe(struct platform_device *pdev)
 {
-        struct exynos4_ohci_platdata *pdata;
+        struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
         struct exynos_ohci_hcd *exynos_ohci;
         struct usb_hcd *hcd;
         struct ohci_hcd *ohci;
         struct resource *res;
+        struct usb_phy *phy;
         int irq;
         int err;
 
-        pdata = pdev->dev.platform_data;
-        if (!pdata) {
-                dev_err(&pdev->dev, "No platform data defined\n");
-                return -EINVAL;
-        }
-
         /*
          * Right now device-tree probed devices don't get dma_mask set.
          * Since shared usb code relies on it, set it here for now.
@@ -107,6 +127,20 @@ static int exynos_ohci_probe(struct platform_device *pdev)
         if (!exynos_ohci)
                 return -ENOMEM;
 
+        phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
+        if (IS_ERR_OR_NULL(phy)) {
+                /* Fallback to pdata */
+                if (!pdata) {
+                        dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
+                        return -EPROBE_DEFER;
+                } else {
+                        exynos_ohci->pdata = pdata;
+                }
+        } else {
+                exynos_ohci->phy = phy;
+                exynos_ohci->otg = phy->otg;
+        }
+
         exynos_ohci->dev = &pdev->dev;
 
         hcd = usb_create_hcd(&exynos_ohci_hc_driver, &pdev->dev,
@@ -152,8 +186,11 @@ static int exynos_ohci_probe(struct platform_device *pdev)
                 goto fail_io;
         }
 
-        if (pdata->phy_init)
-                pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+        if (exynos_ohci->otg)
+                exynos_ohci->otg->set_host(exynos_ohci->otg,
+                                        &exynos_ohci->hcd->self);
+
+        exynos_ohci_phy_enable(exynos_ohci);
 
         ohci = hcd_to_ohci(hcd);
         ohci_hcd_init(ohci);
@@ -161,13 +198,15 @@ static int exynos_ohci_probe(struct platform_device *pdev)
         err = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (err) {
                 dev_err(&pdev->dev, "Failed to add USB HCD\n");
-                goto fail_io;
+                goto fail_add_hcd;
         }
 
         platform_set_drvdata(pdev, exynos_ohci);
 
         return 0;
 
+fail_add_hcd:
+        exynos_ohci_phy_disable(exynos_ohci);
 fail_io:
         clk_disable_unprepare(exynos_ohci->clk);
 fail_clk:
@@ -177,14 +216,16 @@ fail_clk:
 
 static int exynos_ohci_remove(struct platform_device *pdev)
 {
-        struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
         struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev);
         struct usb_hcd *hcd = exynos_ohci->hcd;
 
         usb_remove_hcd(hcd);
 
-        if (pdata && pdata->phy_exit)
-                pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+        if (exynos_ohci->otg)
+                exynos_ohci->otg->set_host(exynos_ohci->otg,
+                                        &exynos_ohci->hcd->self);
+
+        exynos_ohci_phy_disable(exynos_ohci);
 
         clk_disable_unprepare(exynos_ohci->clk);
 
@@ -208,8 +249,6 @@ static int exynos_ohci_suspend(struct device *dev)
         struct exynos_ohci_hcd *exynos_ohci = dev_get_drvdata(dev);
         struct usb_hcd *hcd = exynos_ohci->hcd;
         struct ohci_hcd *ohci = hcd_to_ohci(hcd);
-        struct platform_device *pdev = to_platform_device(dev);
-        struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
         unsigned long flags;
         int rc = 0;
 
@@ -228,8 +267,11 @@ static int exynos_ohci_suspend(struct device *dev)
 
         clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 
-        if (pdata && pdata->phy_exit)
-                pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+        if (exynos_ohci->otg)
+                exynos_ohci->otg->set_host(exynos_ohci->otg,
+                                        &exynos_ohci->hcd->self);
+
+        exynos_ohci_phy_disable(exynos_ohci);
 
         clk_disable_unprepare(exynos_ohci->clk);
 
@@ -243,13 +285,14 @@ static int exynos_ohci_resume(struct device *dev)
 {
         struct exynos_ohci_hcd *exynos_ohci = dev_get_drvdata(dev);
         struct usb_hcd *hcd = exynos_ohci->hcd;
-        struct platform_device *pdev = to_platform_device(dev);
-        struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
 
         clk_prepare_enable(exynos_ohci->clk);
 
-        if (pdata && pdata->phy_init)
-                pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+        if (exynos_ohci->otg)
+                exynos_ohci->otg->set_host(exynos_ohci->otg,
+                                        &exynos_ohci->hcd->self);
+
+        exynos_ohci_phy_enable(exynos_ohci);
 
         ohci_resume(hcd, false);
 
@@ -267,7 +310,7 @@ static const struct dev_pm_ops exynos_ohci_pm_ops = {
 
 #ifdef CONFIG_OF
 static const struct of_device_id exynos_ohci_match[] = {
-        { .compatible = "samsung,exynos-ohci" },
+        { .compatible = "samsung,exynos4210-ohci" },
         {},
 };
 MODULE_DEVICE_TABLE(of, exynos_ohci_match);
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index 7482cfbe8c5e..88731b7c5f42 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -44,6 +44,7 @@ __acquires(ohci->lock)
         // ASSERT (urb->hcpriv != 0);
 
         urb_free_priv (ohci, urb->hcpriv);
+        urb->hcpriv = NULL;
         if (likely(status == -EINPROGRESS))
                 status = 0;
 
diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c
index fc0b0daac93d..455737546525 100644
--- a/drivers/usb/host/uhci-debug.c
+++ b/drivers/usb/host/uhci-debug.c
@@ -16,6 +16,8 @@
 
 #include "uhci-hcd.h"
 
+#define EXTRA_SPACE     1024
+
 static struct dentry *uhci_debugfs_root;
 
 #ifdef DEBUG
@@ -44,10 +46,6 @@ static int uhci_show_td(struct uhci_hcd *uhci, struct uhci_td *td, char *buf,
         char *spid;
         u32 status, token;
 
-        /* Try to make sure there's enough memory */
-        if (len < 160)
-                return 0;
-
         status = td_status(uhci, td);
         out += sprintf(out, "%*s[%p] link (%08x) ", space, "", td,
                 hc32_to_cpu(uhci, td->link));
@@ -64,6 +62,8 @@ static int uhci_show_td(struct uhci_hcd *uhci, struct uhci_td *td, char *buf,
                 (status & TD_CTRL_CRCTIMEO) ? "CRC/Timeo " : "",
                 (status & TD_CTRL_BITSTUFF) ? "BitStuff " : "",
                 status & 0x7ff);
+        if (out - buf > len)
+                goto done;
 
         token = td_token(uhci, td);
         switch (uhci_packetid(token)) {
@@ -90,6 +90,9 @@ static int uhci_show_td(struct uhci_hcd *uhci, struct uhci_td *td, char *buf,
                 spid);
         out += sprintf(out, "(buf=%08x)\n", hc32_to_cpu(uhci, td->buffer));
 
+done:
+        if (out - buf > len)
+                out += sprintf(out, " ...\n");
         return out - buf;
 }
 
@@ -101,8 +104,6 @@ static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp,
         int i, nactive, ninactive;
         char *ptype;
 
-        if (len < 200)
-                return 0;
 
         out += sprintf(out, "urb_priv [%p] ", urbp);
         out += sprintf(out, "urb [%p] ", urbp->urb);
@@ -110,6 +111,8 @@ static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp,
         out += sprintf(out, "Dev=%d ", usb_pipedevice(urbp->urb->pipe));
         out += sprintf(out, "EP=%x(%s) ", usb_pipeendpoint(urbp->urb->pipe),
                         (usb_pipein(urbp->urb->pipe) ? "IN" : "OUT"));
+        if (out - buf > len)
+                goto done;
 
         switch (usb_pipetype(urbp->urb->pipe)) {
         case PIPE_ISOCHRONOUS: ptype = "ISO"; break;
@@ -128,6 +131,9 @@ static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp,
                 out += sprintf(out, " Unlinked=%d", urbp->urb->unlinked);
         out += sprintf(out, "\n");
 
+        if (out - buf > len)
+                goto done;
+
         i = nactive = ninactive = 0;
         list_for_each_entry(td, &urbp->td_list, list) {
                 if (urbp->qh->type != USB_ENDPOINT_XFER_ISOC &&
@@ -135,6 +141,8 @@ static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp,
                         out += sprintf(out, "%*s%d: ", space + 2, "", i);
                         out += uhci_show_td(uhci, td, out,
                                         len - (out - buf), 0);
+                        if (out - buf > len)
+                                goto tail;
                 } else {
                         if (td_status(uhci, td) & TD_CTRL_ACTIVE)
                                 ++nactive;
@@ -143,10 +151,13 @@ static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp,
                 }
         }
         if (nactive + ninactive > 0)
-                out += sprintf(out, "%*s[skipped %d inactive and %d active "
-                                "TDs]\n",
+                out += sprintf(out,
+                                "%*s[skipped %d inactive and %d active TDs]\n",
                                 space, "", ninactive, nactive);
-
+done:
+        if (out - buf > len)
+                out += sprintf(out, " ...\n");
+tail:
         return out - buf;
 }
 
@@ -158,10 +169,6 @@ static int uhci_show_qh(struct uhci_hcd *uhci,
         __hc32 element = qh_element(qh);
         char *qtype;
 
-        /* Try to make sure there's enough memory */
-        if (len < 80 * 7)
-                return 0;
-
         switch (qh->type) {
         case USB_ENDPOINT_XFER_ISOC: qtype = "ISO"; break;
         case USB_ENDPOINT_XFER_INT: qtype = "INT"; break;
@@ -175,13 +182,15 @@ static int uhci_show_qh(struct uhci_hcd *uhci,
                         hc32_to_cpu(uhci, qh->link),
                         hc32_to_cpu(uhci, element));
         if (qh->type == USB_ENDPOINT_XFER_ISOC)
-                out += sprintf(out, "%*s    period %d phase %d load %d us, "
-                                "frame %x desc [%p]\n",
+                out += sprintf(out,
+                                "%*s    period %d phase %d load %d us, frame %x desc [%p]\n",
                                 space, "", qh->period, qh->phase, qh->load,
                                 qh->iso_frame, qh->iso_packet_desc);
         else if (qh->type == USB_ENDPOINT_XFER_INT)
                 out += sprintf(out, "%*s    period %d phase %d load %d us\n",
                                 space, "", qh->period, qh->phase, qh->load);
+        if (out - buf > len)
+                goto done;
 
         if (element & UHCI_PTR_QH(uhci))
                 out += sprintf(out, "%*s  Element points to QH (bug?)\n", space, "");
@@ -195,11 +204,17 @@ static int uhci_show_qh(struct uhci_hcd *uhci,
         if (!(element & ~(UHCI_PTR_QH(uhci) | UHCI_PTR_DEPTH(uhci))))
                 out += sprintf(out, "%*s  Element is NULL (bug?)\n", space, "");
 
+        if (out - buf > len)
+                goto done;
+
         if (list_empty(&qh->queue)) {
                 out += sprintf(out, "%*s  queue is empty\n", space, "");
-                if (qh == uhci->skel_async_qh)
+                if (qh == uhci->skel_async_qh) {
                         out += uhci_show_td(uhci, uhci->term_td, out,
                                         len - (out - buf), 0);
+                        if (out - buf > len)
+                                goto tail;
+                }
         } else {
                 struct urb_priv *urbp = list_entry(qh->queue.next,
                                 struct urb_priv, node);
@@ -211,9 +226,12 @@ static int uhci_show_qh(struct uhci_hcd *uhci,
                                         space, "");
                 i = nurbs = 0;
                 list_for_each_entry(urbp, &qh->queue, node) {
-                        if (++i <= 10)
+                        if (++i <= 10) {
                                 out += uhci_show_urbp(uhci, urbp, out,
                                                 len - (out - buf), space + 2);
+                                if (out - buf > len)
+                                        goto tail;
+                        }
                         else
                                 ++nurbs;
                 }
@@ -222,24 +240,27 @@ static int uhci_show_qh(struct uhci_hcd *uhci,
                                         space, "", nurbs);
         }
 
+        if (out - buf > len)
+                goto done;
+
         if (qh->dummy_td) {
                 out += sprintf(out, "%*s  Dummy TD\n", space, "");
                 out += uhci_show_td(uhci, qh->dummy_td, out,
                                 len - (out - buf), 0);
+                if (out - buf > len)
+                        goto tail;
         }
 
+done:
+        if (out - buf > len)
+                out += sprintf(out, " ...\n");
+tail:
         return out - buf;
 }
 
-static int uhci_show_sc(int port, unsigned short status, char *buf, int len)
+static int uhci_show_sc(int port, unsigned short status, char *buf)
 {
-        char *out = buf;
-
-        /* Try to make sure there's enough memory */
-        if (len < 160)
-                return 0;
-
-        out += sprintf(out, "  stat%d     =     %04x  %s%s%s%s%s%s%s%s%s%s\n",
+        return sprintf(buf, "  stat%d     =     %04x  %s%s%s%s%s%s%s%s%s%s\n",
                 port,
                 status,
                 (status & USBPORTSC_SUSP) ?     " Suspend" : "",
@@ -252,19 +273,12 @@ static int uhci_show_sc(int port, unsigned short status, char *buf, int len)
                 (status & USBPORTSC_PE) ?       " Enabled" : "",
                 (status & USBPORTSC_CSC) ?      " ConnectChange" : "",
                 (status & USBPORTSC_CCS) ?      " Connected" : "");
-
-        return out - buf;
 }
 
-static int uhci_show_root_hub_state(struct uhci_hcd *uhci, char *buf, int len)
+static int uhci_show_root_hub_state(struct uhci_hcd *uhci, char *buf)
 {
-        char *out = buf;
         char *rh_state;
 
-        /* Try to make sure there's enough memory */
-        if (len < 60)
-                return 0;
-
         switch (uhci->rh_state) {
             case UHCI_RH_RESET:
                 rh_state = "reset";             break;
@@ -283,9 +297,8 @@ static int uhci_show_root_hub_state(struct uhci_hcd *uhci, char *buf, int len)
             default:
                 rh_state = "?";                 break;
         }
-        out += sprintf(out, "Root-hub state: %s   FSBR: %d\n",
+        return sprintf(buf, "Root-hub state: %s   FSBR: %d\n",
                         rh_state, uhci->fsbr_is_on);
-        return out - buf;
 }
 
 static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
@@ -296,9 +309,6 @@ static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
         unsigned char sof;
         unsigned short portsc1, portsc2;
 
-        /* Try to make sure there's enough memory */
-        if (len < 80 * 9)
-                return 0;
 
         usbcmd    = uhci_readw(uhci, 0);
         usbstat   = uhci_readw(uhci, 2);
@@ -319,6 +329,8 @@ static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
                 (usbcmd & USBCMD_GRESET) ?  "GRESET " : "",
                 (usbcmd & USBCMD_HCRESET) ? "HCRESET " : "",
                 (usbcmd & USBCMD_RS) ?      "RS " : "");
+        if (out - buf > len)
+                goto done;
 
         out += sprintf(out, "  usbstat   =     %04x   %s%s%s%s%s%s\n",
                 usbstat,
@@ -328,19 +340,33 @@ static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
                 (usbstat & USBSTS_RD) ?     "ResumeDetect " : "",
                 (usbstat & USBSTS_ERROR) ?  "USBError " : "",
                 (usbstat & USBSTS_USBINT) ? "USBINT " : "");
+        if (out - buf > len)
+                goto done;
 
         out += sprintf(out, "  usbint    =     %04x\n", usbint);
         out += sprintf(out, "  usbfrnum  =   (%d)%03x\n", (usbfrnum >> 10) & 1,
                 0xfff & (4*(unsigned int)usbfrnum));
         out += sprintf(out, "  flbaseadd = %08x\n", flbaseadd);
         out += sprintf(out, "  sof       =       %02x\n", sof);
-        out += uhci_show_sc(1, portsc1, out, len - (out - buf));
-        out += uhci_show_sc(2, portsc2, out, len - (out - buf));
-        out += sprintf(out, "Most recent frame: %x (%d)   "
-                        "Last ISO frame: %x (%d)\n",
+        if (out - buf > len)
+                goto done;
+
+        out += uhci_show_sc(1, portsc1, out);
+        if (out - buf > len)
+                goto done;
+
+        out += uhci_show_sc(2, portsc2, out);
+        if (out - buf > len)
+                goto done;
+
+        out += sprintf(out,
+                        "Most recent frame: %x (%d)   Last ISO frame: %x (%d)\n",
                         uhci->frame_number, uhci->frame_number & 1023,
                         uhci->last_iso_frame, uhci->last_iso_frame & 1023);
 
+done:
+        if (out - buf > len)
+                out += sprintf(out, " ...\n");
         return out - buf;
 }
 
@@ -360,9 +386,13 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)
                 "int8", "int4", "int2", "async", "term"
         };
 
-        out += uhci_show_root_hub_state(uhci, out, len - (out - buf));
+        out += uhci_show_root_hub_state(uhci, out);
+        if (out - buf > len)
+                goto done;
         out += sprintf(out, "HC status\n");
         out += uhci_show_status(uhci, out, len - (out - buf));
+        if (out - buf > len)
+                goto tail;
 
         out += sprintf(out, "Periodic load table\n");
         for (i = 0; i < MAX_PHASE; ++i) {
@@ -375,7 +405,7 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)
                         uhci_to_hcd(uhci)->self.bandwidth_int_reqs,
                         uhci_to_hcd(uhci)->self.bandwidth_isoc_reqs);
         if (debug <= 1)
-                return out - buf;
+                goto tail;
 
         out += sprintf(out, "Frame List\n");
         nframes = 10;
@@ -383,6 +413,8 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)
         for (i = 0; i < UHCI_NUMFRAMES; ++i) {
                 __hc32 qh_dma;
 
+                if (out - buf > len)
+                        goto done;
                 j = 0;
                 td = uhci->frame_cpu[i];
                 link = uhci->frame[i];
@@ -401,15 +433,20 @@ static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)
                         td = list_entry(tmp, struct uhci_td, fl_list);
                         tmp = tmp->next;
                         if (link != LINK_TO_TD(uhci, td)) {
-                                if (nframes > 0)
-                                        out += sprintf(out, "    link does "
-                                                "not match list entry!\n");
-                                else
+                                if (nframes > 0) {
+                                        out += sprintf(out,
+                                                "    link does not match list entry!\n");
+                                        if (out - buf > len)
+                                                goto done;
+                                } else
                                         ++nerrs;
                         }
-                        if (nframes > 0)
+                        if (nframes > 0) {
                                 out += uhci_show_td(uhci, td, out,
                                                 len - (out - buf), 4);
+                                if (out - buf > len)
+                                        goto tail;
+                        }
                         link = td->link;
                 } while (tmp != head);
 
@@ -423,9 +460,11 @@ check_link:
                                                 i, hc32_to_cpu(uhci, link));
                                         j = 1;
                                 }
-                                out += sprintf(out, "   link does not match "
-                                        "QH (%08x)!\n",
+                                out += sprintf(out,
+                                        "   link does not match QH (%08x)!\n",
                                         hc32_to_cpu(uhci, qh_dma));
+                                if (out - buf > len)
+                                        goto done;
                         } else
                                 ++nerrs;
                 }
@@ -436,18 +475,27 @@ check_link:
 
         out += sprintf(out, "Skeleton QHs\n");
 
+        if (out - buf > len)
+                goto done;
+
         fsbr_link = 0;
         for (i = 0; i < UHCI_NUM_SKELQH; ++i) {
                 int cnt = 0;
 
                 qh = uhci->skelqh[i];
-                out += sprintf(out, "- skel_%s_qh\n", qh_names[i]); \
+                out += sprintf(out, "- skel_%s_qh\n", qh_names[i]);
                 out += uhci_show_qh(uhci, qh, out, len - (out - buf), 4);
+                if (out - buf > len)
+                        goto tail;
 
                 /* Last QH is the Terminating QH, it's different */
                 if (i == SKEL_TERM) {
-                        if (qh_element(qh) != LINK_TO_TD(uhci, uhci->term_td))
-                                out += sprintf(out, "    skel_term_qh element is not set to term_td!\n");
+                        if (qh_element(qh) != LINK_TO_TD(uhci, uhci->term_td)) {
+                                out += sprintf(out,
+                                        "    skel_term_qh element is not set to term_td!\n");
+                                if (out - buf > len)
+                                        goto done;
+                        }
                         link = fsbr_link;
                         if (!link)
                                 link = LINK_TO_QH(uhci, uhci->skel_term_qh);
@@ -460,9 +508,12 @@ check_link:
                 while (tmp != head) {
                         qh = list_entry(tmp, struct uhci_qh, node);
                         tmp = tmp->next;
-                        if (++cnt <= 10)
+                        if (++cnt <= 10) {
                                 out += uhci_show_qh(uhci, qh, out,
                                                 len - (out - buf), 4);
+                                if (out - buf > len)
+                                        goto tail;
+                        }
                         if (!fsbr_link && qh->skel >= SKEL_FSBR)
                                 fsbr_link = LINK_TO_QH(uhci, qh);
                 }
@@ -480,9 +531,17 @@ check_link:
                         link = LINK_TO_QH(uhci, uhci->skel_term_qh);
 check_qh_link:
                 if (qh->link != link)
-                        out += sprintf(out, "    last QH not linked to next skeleton!\n");
+                        out += sprintf(out,
+                                "    last QH not linked to next skeleton!\n");
+
+                if (out - buf > len)
+                        goto done;
         }
 
+done:
+        if (out - buf > len)
+                out += sprintf(out, " ...\n");
+tail:
         return out - buf;
 }
 
@@ -514,7 +573,8 @@ static int uhci_debug_open(struct inode *inode, struct file *file)
         up->size = 0;
         spin_lock_irqsave(&uhci->lock, flags);
         if (uhci->is_initialized)
-                up->size = uhci_sprint_schedule(uhci, up->data, MAX_OUTPUT);
+                up->size = uhci_sprint_schedule(uhci, up->data,
+                                        MAX_OUTPUT - EXTRA_SPACE);
         spin_unlock_irqrestore(&uhci->lock, flags);
 
         file->private_data = up;
@@ -529,7 +589,9 @@ static loff_t uhci_debug_lseek(struct file *file, loff_t off, int whence)
 
         up = file->private_data;
 
-        /* XXX: atomic 64bit seek access, but that needs to be fixed in the VFS */
+        /*
+         * XXX: atomic 64bit seek access, but that needs to be fixed in the VFS
+         */
         switch (whence) {
         case 0:
                 new = off;
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 4f64d24eebc8..4a86b63745b8 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -453,20 +453,19 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
 
         if (status & ~(USBSTS_USBINT | USBSTS_ERROR | USBSTS_RD)) {
                 if (status & USBSTS_HSE)
-                        dev_err(uhci_dev(uhci), "host system error, "
-                                        "PCI problems?\n");
+                        dev_err(uhci_dev(uhci),
+                                "host system error, PCI problems?\n");
                 if (status & USBSTS_HCPE)
-                        dev_err(uhci_dev(uhci), "host controller process "
-                                        "error, something bad happened!\n");
+                        dev_err(uhci_dev(uhci),
+                                "host controller process error, something bad happened!\n");
                 if (status & USBSTS_HCH) {
                         if (uhci->rh_state >= UHCI_RH_RUNNING) {
                                 dev_err(uhci_dev(uhci),
-                                        "host controller halted, "
-                                        "very bad!\n");
+                                        "host controller halted, very bad!\n");
                                 if (debug > 1 && errbuf) {
                                         /* Print the schedule for debugging */
-                                        uhci_sprint_schedule(uhci,
-                                                        errbuf, ERRBUF_LEN);
+                                        uhci_sprint_schedule(uhci, errbuf,
+                                                ERRBUF_LEN - EXTRA_SPACE);
                                         lprintk(errbuf);
                                 }
                                 uhci_hc_died(uhci);
@@ -592,8 +591,8 @@ static int uhci_start(struct usb_hcd *hcd)
                         UHCI_NUMFRAMES * sizeof(*uhci->frame),
                         &uhci->frame_dma_handle, 0);
         if (!uhci->frame) {
-                dev_err(uhci_dev(uhci), "unable to allocate "
-                                "consistent memory for frame list\n");
+                dev_err(uhci_dev(uhci),
+                        "unable to allocate consistent memory for frame list\n");
                 goto err_alloc_frame;
         }
         memset(uhci->frame, 0, UHCI_NUMFRAMES * sizeof(*uhci->frame));
@@ -601,8 +600,8 @@ static int uhci_start(struct usb_hcd *hcd)
         uhci->frame_cpu = kcalloc(UHCI_NUMFRAMES, sizeof(*uhci->frame_cpu),
                         GFP_KERNEL);
         if (!uhci->frame_cpu) {
-                dev_err(uhci_dev(uhci), "unable to allocate "
-                                "memory for frame pointers\n");
+                dev_err(uhci_dev(uhci),
+                        "unable to allocate memory for frame pointers\n");
                 goto err_alloc_frame_cpu;
         }
 
@@ -737,8 +736,8 @@ static int uhci_rh_suspend(struct usb_hcd *hcd)
          */
         else if (hcd->self.root_hub->do_remote_wakeup &&
                         uhci->resuming_ports) {
-                dev_dbg(uhci_dev(uhci), "suspend failed because a port "
-                                "is resuming\n");
+                dev_dbg(uhci_dev(uhci),
+                        "suspend failed because a port is resuming\n");
                 rc = -EBUSY;
         } else
                 suspend_rh(uhci, UHCI_RH_SUSPENDED);
@@ -829,8 +828,8 @@ static int uhci_count_ports(struct usb_hcd *hcd)
 
         /* Anything greater than 7 is weird so we'll ignore it. */
         if (port > UHCI_RH_MAXCHILD) {
-                dev_info(uhci_dev(uhci), "port count misdetected? "
-                                "forcing to 2 ports\n");
+                dev_info(uhci_dev(uhci),
+                        "port count misdetected? forcing to 2 ports\n");
                 port = 2;
         }
 
diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h
index 7af2b7052047..6f986d82472d 100644
--- a/drivers/usb/host/uhci-hcd.h
+++ b/drivers/usb/host/uhci-hcd.h
@@ -212,10 +212,6 @@ struct uhci_qh {
 #define TD_CTRL_BITSTUFF        (1 << 17)       /* Bit Stuff Error */
 #define TD_CTRL_ACTLEN_MASK     0x7FF   /* actual length, encoded as n - 1 */
 
-#define TD_CTRL_ANY_ERROR       (TD_CTRL_STALLED | TD_CTRL_DBUFERR | \
-                                 TD_CTRL_BABBLE | TD_CTRL_CRCTIME | \
-                                 TD_CTRL_BITSTUFF)
-
 #define uhci_maxerr(err)                ((err) << TD_CTRL_C_ERR_SHIFT)
 #define uhci_status_bits(ctrl_sts)      ((ctrl_sts) & 0xF60000)
 #define uhci_actual_length(ctrl_sts)    (((ctrl_sts) + 1) & \
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index 15d13229ddbb..f87bee6d2789 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -21,8 +21,8 @@ static const __u8 root_hub_hub_des[] =
         0x00,                   /*   (per-port OC, no power switching) */
         0x01,                   /*  __u8  bPwrOn2pwrGood; 2ms */
         0x00,                   /*  __u8  bHubContrCurrent; 0 mA */
-        0x00,                   /*  __u8  DeviceRemovable; *** 7 Ports max *** */
-        0xff                    /*  __u8  PortPwrCtrlMask; *** 7 ports max *** */
+        0x00,                   /*  __u8  DeviceRemovable; *** 7 Ports max */
+        0xff                    /*  __u8  PortPwrCtrlMask; *** 7 ports max */
 };
 
 #define UHCI_RH_MAXCHILD        7
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index 15921fd55048..f0976d8190bc 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -1200,7 +1200,7 @@ static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb)
                                 if (debug > 1 && errbuf) {
                                         /* Print the chain for debugging */
                                         uhci_show_qh(uhci, urbp->qh, errbuf,
-                                                        ERRBUF_LEN, 0);
+                                                ERRBUF_LEN - EXTRA_SPACE, 0);
                                         lprintk(errbuf);
                                 }
                         }
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 7f76a49e90d3..882875465301 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2708,13 +2708,11 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
 {
         struct xhci_hcd *xhci = hcd_to_xhci(hcd);
         u32 status;
-        union xhci_trb *trb;
         u64 temp_64;
         union xhci_trb *event_ring_deq;
         dma_addr_t deq;
 
         spin_lock(&xhci->lock);
-        trb = xhci->event_ring->dequeue;
         /* Check if the xHC generated the interrupt, or the irq is shared */
         status = xhci_readl(xhci, &xhci->op_regs->status);
         if (status == 0xffffffff)
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index fecde69bfa7d..3b1a3f4ec5e9 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -250,3 +250,9 @@ config USB_EZUSB_FX2
         help
           Say Y here if you need EZUSB device support.
           (Cypress FX/FX2/FX2LP microcontrollers)
+
+config USB_HSIC_USB3503
+       tristate "USB3503 HSIC to USB20 Driver"
+       depends on I2C
+       help
+         This option enables support for SMSC USB3503 HSIC to USB 2.0 Driver.
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 3e99a643294b..3e1bd70b06ea 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -26,5 +26,6 @@ obj-$(CONFIG_USB_TRANCEVIBRATOR)	+= trancevibrator.o
 obj-$(CONFIG_USB_USS720)                += uss720.o
 obj-$(CONFIG_USB_SEVSEG)                += usbsevseg.o
 obj-$(CONFIG_USB_YUREX)                 += yurex.o
+obj-$(CONFIG_USB_HSIC_USB3503)          += usb3503.o
 
 obj-$(CONFIG_USB_SISUSBVGA)             += sisusbvga/
diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
new file mode 100644
index 000000000000..f713f6aeb6e5
--- /dev/null
+++ b/drivers/usb/misc/usb3503.c
@@ -0,0 +1,325 @@
+/*
+ * Driver for SMSC USB3503 USB 2.0 hub controller driver
+ *
+ * Copyright (c) 2012-2013 Dongjin Kim (tobetter@gmail.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/usb3503.h>
+
+#define USB3503_VIDL            0x00
+#define USB3503_VIDM            0x01
+#define USB3503_PIDL            0x02
+#define USB3503_PIDM            0x03
+#define USB3503_DIDL            0x04
+#define USB3503_DIDM            0x05
+
+#define USB3503_CFG1            0x06
+#define USB3503_SELF_BUS_PWR    (1 << 7)
+
+#define USB3503_CFG2            0x07
+#define USB3503_CFG3            0x08
+#define USB3503_NRD             0x09
+
+#define USB3503_PDS             0x0a
+#define USB3503_PORT1           (1 << 1)
+#define USB3503_PORT2           (1 << 2)
+#define USB3503_PORT3           (1 << 3)
+
+#define USB3503_SP_ILOCK        0xe7
+#define USB3503_SPILOCK_CONNECT (1 << 1)
+#define USB3503_SPILOCK_CONFIG  (1 << 0)
+
+#define USB3503_CFGP            0xee
+#define USB3503_CLKSUSP         (1 << 7)
+
+struct usb3503 {
+        enum usb3503_mode       mode;
+        struct i2c_client       *client;
+        int     gpio_intn;
+        int     gpio_reset;
+        int     gpio_connect;
+};
+
+static int usb3503_write_register(struct i2c_client *client,
+                char reg, char data)
+{
+        return i2c_smbus_write_byte_data(client, reg, data);
+}
+
+static int usb3503_read_register(struct i2c_client *client, char reg)
+{
+        return i2c_smbus_read_byte_data(client, reg);
+}
+
+static int usb3503_set_bits(struct i2c_client *client, char reg, char req)
+{
+        int err;
+
+        err = usb3503_read_register(client, reg);
+        if (err < 0)
+                return err;
+
+        err = usb3503_write_register(client, reg, err | req);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+static int usb3503_clear_bits(struct i2c_client *client, char reg, char req)
+{
+        int err;
+
+        err = usb3503_read_register(client, reg);
+        if (err < 0)
+                return err;
+
+        err = usb3503_write_register(client, reg, err & ~req);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+static int usb3503_reset(int gpio_reset, int state)
+{
+        if (gpio_is_valid(gpio_reset))
+                gpio_set_value(gpio_reset, state);
+
+        /* Wait RefClk when RESET_N is released, otherwise Hub will
+         * not transition to Hub Communication Stage.
+         */
+        if (state)
+                msleep(100);
+
+        return 0;
+}
+
+static int usb3503_switch_mode(struct usb3503 *hub, enum usb3503_mode mode)
+{
+        struct i2c_client *i2c = hub->client;
+        int err = 0;
+
+        switch (mode) {
+        case USB3503_MODE_HUB:
+                usb3503_reset(hub->gpio_reset, 1);
+
+                /* SP_ILOCK: set connect_n, config_n for config */
+                err = usb3503_write_register(i2c, USB3503_SP_ILOCK,
+                                (USB3503_SPILOCK_CONNECT
+                                 | USB3503_SPILOCK_CONFIG));
+                if (err < 0) {
+                        dev_err(&i2c->dev, "SP_ILOCK failed (%d)\n", err);
+                        goto err_hubmode;
+                }
+
+                /* PDS : Port2,3 Disable For Self Powered Operation */
+                err = usb3503_set_bits(i2c, USB3503_PDS,
+                                (USB3503_PORT2 | USB3503_PORT3));
+                if (err < 0) {
+                        dev_err(&i2c->dev, "PDS failed (%d)\n", err);
+                        goto err_hubmode;
+                }
+
+                /* CFG1 : SELF_BUS_PWR -> Self-Powerd operation */
+                err = usb3503_set_bits(i2c, USB3503_CFG1, USB3503_SELF_BUS_PWR);
+                if (err < 0) {
+                        dev_err(&i2c->dev, "CFG1 failed (%d)\n", err);
+                        goto err_hubmode;
+                }
+
+                /* SP_LOCK: clear connect_n, config_n for hub connect */
+                err = usb3503_clear_bits(i2c, USB3503_SP_ILOCK,
+                                (USB3503_SPILOCK_CONNECT
+                                 | USB3503_SPILOCK_CONFIG));
+                if (err < 0) {
+                        dev_err(&i2c->dev, "SP_ILOCK failed (%d)\n", err);
+                        goto err_hubmode;
+                }
+
+                hub->mode = mode;
+                dev_info(&i2c->dev, "switched to HUB mode\n");
+                break;
+
+        case USB3503_MODE_STANDBY:
+                usb3503_reset(hub->gpio_reset, 0);
+
+                hub->mode = mode;
+                dev_info(&i2c->dev, "switched to STANDBY mode\n");
+                break;
+
+        default:
+                dev_err(&i2c->dev, "unknown mode is request\n");
+                err = -EINVAL;
+                break;
+        }
+
+err_hubmode:
+        return err;
+}
+
+static int usb3503_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
+{
+        struct usb3503_platform_data *pdata = i2c->dev.platform_data;
+        struct device_node *np = i2c->dev.of_node;
+        struct usb3503 *hub;
+        int err = -ENOMEM;
+        u32 mode = USB3503_MODE_UNKNOWN;
+
+        hub = kzalloc(sizeof(struct usb3503), GFP_KERNEL);
+        if (!hub) {
+                dev_err(&i2c->dev, "private data alloc fail\n");
+                return err;
+        }
+
+        i2c_set_clientdata(i2c, hub);
+        hub->client = i2c;
+
+        if (pdata) {
+                hub->gpio_intn          = pdata->gpio_intn;
+                hub->gpio_connect       = pdata->gpio_connect;
+                hub->gpio_reset         = pdata->gpio_reset;
+                hub->mode               = pdata->initial_mode;
+        } else if (np) {
+                hub->gpio_intn  = of_get_named_gpio(np, "connect-gpios", 0);
+                if (hub->gpio_intn == -EPROBE_DEFER)
+                        return -EPROBE_DEFER;
+                hub->gpio_connect = of_get_named_gpio(np, "intn-gpios", 0);
+                if (hub->gpio_connect == -EPROBE_DEFER)
+                        return -EPROBE_DEFER;
+                hub->gpio_reset = of_get_named_gpio(np, "reset-gpios", 0);
+                if (hub->gpio_reset == -EPROBE_DEFER)
+                        return -EPROBE_DEFER;
+                of_property_read_u32(np, "initial-mode", &mode);
+                hub->mode = mode;
+        }
+
+        if (gpio_is_valid(hub->gpio_intn)) {
+                err = gpio_request_one(hub->gpio_intn,
+                                GPIOF_OUT_INIT_HIGH, "usb3503 intn");
+                if (err) {
+                        dev_err(&i2c->dev,
+                                        "unable to request GPIO %d as connect pin (%d)\n",
+                                        hub->gpio_intn, err);
+                        goto err_out;
+                }
+        }
+
+        if (gpio_is_valid(hub->gpio_connect)) {
+                err = gpio_request_one(hub->gpio_connect,
+                                GPIOF_OUT_INIT_HIGH, "usb3503 connect");
+                if (err) {
+                        dev_err(&i2c->dev,
+                                        "unable to request GPIO %d as connect pin (%d)\n",
+                                        hub->gpio_connect, err);
+                        goto err_gpio_connect;
+                }
+        }
+
+        if (gpio_is_valid(hub->gpio_reset)) {
+                err = gpio_request_one(hub->gpio_reset,
+                                GPIOF_OUT_INIT_LOW, "usb3503 reset");
+                if (err) {
+                        dev_err(&i2c->dev,
+                                        "unable to request GPIO %d as reset pin (%d)\n",
+                                        hub->gpio_reset, err);
+                        goto err_gpio_reset;
+                }
+        }
+
+        usb3503_switch_mode(hub, hub->mode);
+
+        dev_info(&i2c->dev, "%s: probed on  %s mode\n", __func__,
+                        (hub->mode == USB3503_MODE_HUB) ? "hub" : "standby");
+
+        return 0;
+
+err_gpio_reset:
+        if (gpio_is_valid(hub->gpio_connect))
+                gpio_free(hub->gpio_connect);
+err_gpio_connect:
+        if (gpio_is_valid(hub->gpio_intn))
+                gpio_free(hub->gpio_intn);
+err_out:
+        kfree(hub);
+
+        return err;
+}
+
+static int usb3503_remove(struct i2c_client *i2c)
+{
+        struct usb3503 *hub = i2c_get_clientdata(i2c);
+
+        if (gpio_is_valid(hub->gpio_intn))
+                gpio_free(hub->gpio_intn);
+        if (gpio_is_valid(hub->gpio_connect))
+                gpio_free(hub->gpio_connect);
+        if (gpio_is_valid(hub->gpio_reset))
+                gpio_free(hub->gpio_reset);
+
+        kfree(hub);
+
+        return 0;
+}
+
+static const struct i2c_device_id usb3503_id[] = {
+        { USB3503_I2C_NAME, 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, usb3503_id);
+
+#ifdef CONFIG_OF
+static const struct of_device_id usb3503_of_match[] = {
+        { .compatible = "smsc,usb3503", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, usb3503_of_match);
+#endif
+
+static struct i2c_driver usb3503_driver = {
+        .driver = {
+                .name = USB3503_I2C_NAME,
+                .of_match_table = of_match_ptr(usb3503_of_match),
+        },
+        .probe          = usb3503_probe,
+        .remove         = usb3503_remove,
+        .id_table       = usb3503_id,
+};
+
+static int __init usb3503_init(void)
+{
+        return i2c_add_driver(&usb3503_driver);
+}
+
+static void __exit usb3503_exit(void)
+{
+        i2c_del_driver(&usb3503_driver);
+}
+
+module_init(usb3503_init);
+module_exit(usb3503_exit);
+
+MODULE_AUTHOR("Dongjin Kim <tobetter@gmail.com>");
+MODULE_DESCRIPTION("USB3503 USB HUB driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 268148de9714..8b4ca1cb450a 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -13,6 +13,12 @@
 
 /*-------------------------------------------------------------------------*/
 
+static int override_alt = -1;
+module_param_named(alt, override_alt, int, 0644);
+MODULE_PARM_DESC(alt, ">= 0 to override altsetting selection");
+
+/*-------------------------------------------------------------------------*/
+
 /* FIXME make these public somewhere; usbdevfs.h? */
 struct usbtest_param {
         /* inputs */
@@ -103,6 +109,10 @@ get_endpoints(struct usbtest_dev *dev, struct usb_interface *intf)
                 iso_in = iso_out = NULL;
                 alt = intf->altsetting + tmp;
 
+                if (override_alt >= 0 &&
+                                override_alt != alt->desc.bAlternateSetting)
+                        continue;
+
                 /* take the first altsetting with in-bulk + out-bulk;
                  * ignore other endpoints and altsettings.
                  */
@@ -144,6 +154,7 @@ try_iso:
 
 found:
         udev = testdev_to_usbdev(dev);
+        dev->info->alt = alt->desc.bAlternateSetting;
         if (alt->desc.bAlternateSetting != 0) {
                 tmp = usb_set_interface(udev,
                                 alt->desc.bInterfaceNumber,
@@ -2280,7 +2291,7 @@ usbtest_probe(struct usb_interface *intf, const struct usb_device_id *id)
                         wtest = " intr-out";
                 }
         } else {
-                if (info->autoconf) {
+                if (override_alt >= 0 || info->autoconf) {
                         int status;
 
                         status = get_endpoints(dev, intf);
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 23a0b7f0892d..45b19e2c60ba 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -11,6 +11,7 @@ config USB_MUSB_HDRC
         select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX)
         select TWL4030_USB if MACH_OMAP_3430SDP
         select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
+        select OMAP_CONTROL_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
         select USB_OTG_UTILS
         help
           Say Y here if your system has a dual role high speed USB
@@ -45,6 +46,7 @@ config USB_MUSB_DA8XX
 
 config USB_MUSB_TUSB6010
         tristate "TUSB6010"
+        depends on GENERIC_HARDIRQS
 
 config USB_MUSB_OMAP2PLUS
         tristate "OMAP2430 and onwards"
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index c107d7cdfa69..59eea219034a 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -365,7 +365,7 @@ static int am35x_musb_init(struct musb *musb)
         usb_nop_xceiv_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv))
-                return -ENODEV;
+                return -EPROBE_DEFER;
 
         setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
 
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 14dab9f9b3d0..dbb31b30c7fa 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -406,7 +406,7 @@ static int bfin_musb_init(struct musb *musb)
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv)) {
                 gpio_free(musb->config->gpio_vrsel);
-                return -ENODEV;
+                return -EPROBE_DEFER;
         }
 
         bfin_musb_reg_init(musb);
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 97996af2646e..7c71769d71ff 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -410,6 +410,7 @@ static int da8xx_musb_init(struct musb *musb)
 {
         void __iomem *reg_base = musb->ctrl_base;
         u32 rev;
+        int ret = -ENODEV;
 
         musb->mregs += DA8XX_MENTOR_CORE_OFFSET;
 
@@ -420,8 +421,10 @@ static int da8xx_musb_init(struct musb *musb)
 
         usb_nop_xceiv_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
-        if (IS_ERR_OR_NULL(musb->xceiv))
+        if (IS_ERR_OR_NULL(musb->xceiv)) {
+                ret = -EPROBE_DEFER;
                 goto fail;
+        }
 
         setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);
 
@@ -441,7 +444,7 @@ static int da8xx_musb_init(struct musb *musb)
         musb->isr = da8xx_musb_interrupt;
         return 0;
 fail:
-        return -ENODEV;
+        return ret;
 }
 
 static int da8xx_musb_exit(struct musb *musb)
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index b1c01cad28b2..e040d9103735 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -380,11 +380,14 @@ static int davinci_musb_init(struct musb *musb)
 {
         void __iomem    *tibase = musb->ctrl_base;
         u32             revision;
+        int             ret = -ENODEV;
 
         usb_nop_xceiv_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
-        if (IS_ERR_OR_NULL(musb->xceiv))
+        if (IS_ERR_OR_NULL(musb->xceiv)) {
+                ret = -EPROBE_DEFER;
                 goto unregister;
+        }
 
         musb->mregs += DAVINCI_BASE_OFFSET;
 
@@ -438,7 +441,7 @@ fail:
         usb_put_phy(musb->xceiv);
 unregister:
         usb_nop_xceiv_unregister();
-        return -ENODEV;
+        return ret;
 }
 
 static int davinci_musb_exit(struct musb *musb)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index fd3486745e64..60b41cc28da4 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1993,6 +1993,7 @@ fail2:
         musb_platform_exit(musb);
 
 fail1:
+        pm_runtime_disable(musb->controller);
         dev_err(musb->controller,
                 "musb_init_controller failed with status %d\n", status);
 
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 99f470d26a38..6bb89715b637 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -31,7 +31,6 @@
 
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/of.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
@@ -419,7 +418,7 @@ static int dsps_musb_init(struct musb *musb)
         usb_nop_xceiv_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv))
-                return -ENODEV;
+                return -EPROBE_DEFER;
 
         /* Returns zero if e.g. not clocked */
         rev = dsps_readl(reg_base, wrp->revision);
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 876787438c2f..be18537c5f14 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -408,7 +408,19 @@ static void txstate(struct musb *musb, struct musb_request *req)
                                         csr |= (MUSB_TXCSR_DMAENAB
                                                         | MUSB_TXCSR_DMAMODE
                                                         | MUSB_TXCSR_MODE);
-                                        if (!musb_ep->hb_mult)
+                                        /*
+                                         * Enable Autoset according to table
+                                         * below
+                                         * bulk_split hb_mult   Autoset_Enable
+                                         *      0       0       Yes(Normal)
+                                         *      0       >0      No(High BW ISO)
+                                         *      1       0       Yes(HS bulk)
+                                         *      1       >0      Yes(FS bulk)
+                                         */
+                                        if (!musb_ep->hb_mult ||
+                                                (musb_ep->hb_mult &&
+                                                 can_bulk_split(musb,
+                                                    musb_ep->type)))
                                                 csr |= MUSB_TXCSR_AUTOSET;
                                 }
                                 csr &= ~MUSB_TXCSR_P_UNDERRUN;
@@ -1110,11 +1122,15 @@ static int musb_gadget_enable(struct usb_ep *ep,
                 /* Set TXMAXP with the FIFO size of the endpoint
                  * to disable double buffering mode.
                  */
-                if (musb->double_buffer_not_ok)
+                if (musb->double_buffer_not_ok) {
                         musb_writew(regs, MUSB_TXMAXP, hw_ep->max_packet_sz_tx);
-                else
+                } else {
+                        if (can_bulk_split(musb, musb_ep->type))
+                                musb_ep->hb_mult = (hw_ep->max_packet_sz_tx /
+                                                        musb_ep->packet_sz) - 1;
                         musb_writew(regs, MUSB_TXMAXP, musb_ep->packet_sz
                                         | (musb_ep->hb_mult << 11));
+                }
 
                 csr = MUSB_TXCSR_MODE | MUSB_TXCSR_CLRDATATOG;
                 if (musb_readw(regs, MUSB_TXCSR)
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index e9f0fd9ddd2d..1ce1fcf3f3e7 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -634,7 +634,17 @@ static bool musb_tx_dma_program(struct dma_controller *dma,
                 mode = 1;
                 csr |= MUSB_TXCSR_DMAMODE | MUSB_TXCSR_DMAENAB;
                 /* autoset shouldn't be set in high bandwidth */
-                if (qh->hb_mult == 1)
+                /*
+                 * Enable Autoset according to table
+                 * below
+                 * bulk_split hb_mult   Autoset_Enable
+                 *      0       1       Yes(Normal)
+                 *      0       >1      No(High BW ISO)
+                 *      1       1       Yes(HS bulk)
+                 *      1       >1      Yes(FS bulk)
+                 */
+                if (qh->hb_mult == 1 || (qh->hb_mult > 1 &&
+                                        can_bulk_split(hw_ep->musb, qh->type)))
                         csr |= MUSB_TXCSR_AUTOSET;
         } else {
                 mode = 0;
@@ -746,7 +756,13 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                 /* general endpoint setup */
                 if (epnum) {
                         /* flush all old state, set default */
-                        musb_h_tx_flush_fifo(hw_ep);
+                        /*
+                         * We could be flushing valid
+                         * packets in double buffering
+                         * case
+                         */
+                        if (!hw_ep->tx_double_buffered)
+                                musb_h_tx_flush_fifo(hw_ep);
 
                         /*
                          * We must not clear the DMAMODE bit before or in
@@ -763,11 +779,13 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                                         );
                         csr |= MUSB_TXCSR_MODE;
 
-                        if (usb_gettoggle(urb->dev, qh->epnum, 1))
-                                csr |= MUSB_TXCSR_H_WR_DATATOGGLE
-                                        | MUSB_TXCSR_H_DATATOGGLE;
-                        else
-                                csr |= MUSB_TXCSR_CLRDATATOG;
+                        if (!hw_ep->tx_double_buffered) {
+                                if (usb_gettoggle(urb->dev, qh->epnum, 1))
+                                        csr |= MUSB_TXCSR_H_WR_DATATOGGLE
+                                                | MUSB_TXCSR_H_DATATOGGLE;
+                                else
+                                        csr |= MUSB_TXCSR_CLRDATATOG;
+                        }
 
                         musb_writew(epio, MUSB_TXCSR, csr);
                         /* REVISIT may need to clear FLUSHFIFO ... */
@@ -791,17 +809,19 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                 /* protocol/endpoint/interval/NAKlimit */
                 if (epnum) {
                         musb_writeb(epio, MUSB_TXTYPE, qh->type_reg);
-                        if (musb->double_buffer_not_ok)
+                        if (musb->double_buffer_not_ok) {
                                 musb_writew(epio, MUSB_TXMAXP,
                                                 hw_ep->max_packet_sz_tx);
-                        else if (can_bulk_split(musb, qh->type))
+                        } else if (can_bulk_split(musb, qh->type)) {
+                                qh->hb_mult = hw_ep->max_packet_sz_tx
+                                                / packet_sz;
                                 musb_writew(epio, MUSB_TXMAXP, packet_sz
-                                        | ((hw_ep->max_packet_sz_tx /
-                                                packet_sz) - 1) << 11);
-                        else
+                                        | ((qh->hb_mult) - 1) << 11);
+                        } else {
                                 musb_writew(epio, MUSB_TXMAXP,
                                                 qh->maxpacket |
                                                 ((qh->hb_mult - 1) << 11));
+                        }
                         musb_writeb(epio, MUSB_TXINTERVAL, qh->intv_reg);
                 } else {
                         musb_writeb(epio, MUSB_NAKLIMIT0, qh->intv_reg);
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index acd5f9d71d03..1762354fe793 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -37,6 +37,7 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/usb/musb-omap.h>
+#include <linux/usb/omap_control_usb.h>
 
 #include "musb_core.h"
 #include "omap2430.h"
@@ -46,7 +47,7 @@ struct omap2430_glue {
         struct platform_device  *musb;
         enum omap_musb_vbus_id_status status;
         struct work_struct      omap_musb_mailbox_work;
-        u32 __iomem             *control_otghs;
+        struct device           *control_otghs;
 };
 #define glue_to_musb(g)         platform_get_drvdata(g->musb)
 
@@ -54,26 +55,6 @@ struct omap2430_glue		*_glue;
 
 static struct timer_list musb_idle_timer;
 
-/**
- * omap4_usb_phy_mailbox - write to usb otg mailbox
- * @glue: struct omap2430_glue *
- * @val: the value to be written to the mailbox
- *
- * On detection of a device (ID pin is grounded), this API should be called
- * to set AVALID, VBUSVALID and ID pin is grounded.
- *
- * When OMAP is connected to a host (OMAP in device mode), this API
- * is called to set AVALID, VBUSVALID and ID pin in high impedance.
- *
- * XXX: This function will be removed once we have a seperate driver for
- * control module
- */
-static void omap4_usb_phy_mailbox(struct omap2430_glue *glue, u32 val)
-{
-        if (glue->control_otghs)
-                writel(val, glue->control_otghs);
-}
-
 static void musb_do_idle(unsigned long _musb)
 {
         struct musb     *musb = (void *)_musb;
@@ -255,11 +236,11 @@ static inline void omap2430_low_level_init(struct musb *musb)
 void omap_musb_mailbox(enum omap_musb_vbus_id_status status)
 {
         struct omap2430_glue    *glue = _glue;
-        struct musb             *musb = glue_to_musb(glue);
 
-        glue->status = status;
-        if (!musb) {
-                dev_err(glue->dev, "musb core is not yet ready\n");
+        if (glue && glue_to_musb(glue)) {
+                glue->status = status;
+        } else {
+                pr_err("%s: musb core is not yet ready\n", __func__);
                 return;
         }
 
@@ -269,7 +250,6 @@ EXPORT_SYMBOL_GPL(omap_musb_mailbox);
 
 static void omap_musb_set_mailbox(struct omap2430_glue *glue)
 {
-        u32 val;
         struct musb *musb = glue_to_musb(glue);
         struct device *dev = musb->controller;
         struct musb_hdrc_platform_data *pdata = dev->platform_data;
@@ -285,8 +265,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 musb->xceiv->last_event = USB_EVENT_ID;
                 if (musb->gadget_driver) {
                         pm_runtime_get_sync(dev);
-                        val = AVALID | VBUSVALID;
-                        omap4_usb_phy_mailbox(glue, val);
+                        omap_control_usb_set_mode(glue->control_otghs,
+                                USB_MODE_HOST);
                         omap2430_musb_set_vbus(musb, 1);
                 }
                 break;
@@ -299,8 +279,7 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 musb->xceiv->last_event = USB_EVENT_VBUS;
                 if (musb->gadget_driver)
                         pm_runtime_get_sync(dev);
-                val = IDDIG | AVALID | VBUSVALID;
-                omap4_usb_phy_mailbox(glue, val);
+                omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);
                 break;
 
         case OMAP_MUSB_ID_FLOAT:
@@ -317,8 +296,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                         if (musb->xceiv->otg->set_vbus)
                                 otg_set_vbus(musb->xceiv->otg, 0);
                 }
-                val = SESSEND | IDDIG;
-                omap4_usb_phy_mailbox(glue, val);
+                omap_control_usb_set_mode(glue->control_otghs,
+                        USB_MODE_DISCONNECT);
                 break;
         default:
                 dev_dbg(dev, "ID float\n");
@@ -366,10 +345,15 @@ static int omap2430_musb_init(struct musb *musb)
          * up through ULPI.  TWL4030-family PMICs include one,
          * which needs a driver, drivers aren't always needed.
          */
-        musb->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+        if (dev->parent->of_node)
+                musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent,
+                    "usb-phy", 0);
+        else
+                musb->xceiv = devm_usb_get_phy_dev(dev, 0);
+
         if (IS_ERR_OR_NULL(musb->xceiv)) {
                 pr_err("HS USB OTG: no transceiver configured\n");
-                return -ENODEV;
+                return -EPROBE_DEFER;
         }
 
         musb->isr = omap2430_musb_interrupt;
@@ -415,7 +399,6 @@ err1:
 static void omap2430_musb_enable(struct musb *musb)
 {
         u8              devctl;
-        u32             val;
         unsigned long timeout = jiffies + msecs_to_jiffies(1000);
         struct device *dev = musb->controller;
         struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
@@ -425,8 +408,7 @@ static void omap2430_musb_enable(struct musb *musb)
         switch (glue->status) {
 
         case OMAP_MUSB_ID_GROUND:
-                val = AVALID | VBUSVALID;
-                omap4_usb_phy_mailbox(glue, val);
+                omap_control_usb_set_mode(glue->control_otghs, USB_MODE_HOST);
                 if (data->interface_type != MUSB_INTERFACE_UTMI)
                         break;
                 devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
@@ -445,8 +427,7 @@ static void omap2430_musb_enable(struct musb *musb)
                 break;
 
         case OMAP_MUSB_VBUS_VALID:
-                val = IDDIG | AVALID | VBUSVALID;
-                omap4_usb_phy_mailbox(glue, val);
+                omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);
                 break;
 
         default:
@@ -456,14 +437,12 @@ static void omap2430_musb_enable(struct musb *musb)
 
 static void omap2430_musb_disable(struct musb *musb)
 {
-        u32 val;
         struct device *dev = musb->controller;
         struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
 
-        if (glue->status != OMAP_MUSB_UNKNOWN) {
-                val = SESSEND | IDDIG;
-                omap4_usb_phy_mailbox(glue, val);
-        }
+        if (glue->status != OMAP_MUSB_UNKNOWN)
+                omap_control_usb_set_mode(glue->control_otghs,
+                        USB_MODE_DISCONNECT);
 }
 
 static int omap2430_musb_exit(struct musb *musb)
@@ -498,7 +477,6 @@ static int omap2430_probe(struct platform_device *pdev)
         struct omap2430_glue            *glue;
         struct device_node              *np = pdev->dev.of_node;
         struct musb_hdrc_config         *config;
-        struct resource                 *res;
         int                             ret = -ENOMEM;
 
         glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
@@ -521,29 +499,23 @@ static int omap2430_probe(struct platform_device *pdev)
         glue->musb                      = musb;
         glue->status                    = OMAP_MUSB_UNKNOWN;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-
-        glue->control_otghs = devm_ioremap_resource(&pdev->dev, res);
-
         if (np) {
                 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
                 if (!pdata) {
                         dev_err(&pdev->dev,
                                 "failed to allocate musb platfrom data\n");
-                        ret = -ENOMEM;
                         goto err2;
                 }
 
                 data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
                 if (!data) {
                         dev_err(&pdev->dev,
-                                        "failed to allocate musb board data\n");
-                        ret = -ENOMEM;
+                                "failed to allocate musb board data\n");
                         goto err2;
                 }
 
                 config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL);
-                if (!data) {
+                if (!config) {
                         dev_err(&pdev->dev,
                                 "failed to allocate musb hdrc config\n");
                         goto err2;
@@ -556,11 +528,22 @@ static int omap2430_probe(struct platform_device *pdev)
                 of_property_read_u32(np, "ram_bits", (u32 *)&config->ram_bits);
                 of_property_read_u32(np, "power", (u32 *)&pdata->power);
                 config->multipoint = of_property_read_bool(np, "multipoint");
+                pdata->has_mailbox = of_property_read_bool(np,
+                    "ti,has-mailbox");
 
                 pdata->board_data       = data;
                 pdata->config           = config;
         }
 
+        if (pdata->has_mailbox) {
+                glue->control_otghs = omap_get_control_dev();
+                if (IS_ERR(glue->control_otghs)) {
+                        dev_vdbg(&pdev->dev, "Failed to get control device\n");
+                        return -ENODEV;
+                }
+        } else {
+                glue->control_otghs = ERR_PTR(-ENODEV);
+        }
         pdata->platform_ops             = &omap2430_ops;
 
         platform_set_drvdata(pdev, glue);
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index 8ef656659fcb..1b5e83a9840e 100644
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -49,13 +49,4 @@
 #define OTG_FORCESTDBY          0x414
 #       define  ENABLEFORCE             (1 << 0)
 
-/*
- * Control Module bit definitions
- * XXX: Will be removed once we have a driver for control module.
- */
-#define AVALID                          BIT(0)
-#define BVALID                          BIT(1)
-#define VBUSVALID                       BIT(2)
-#define SESSEND                         BIT(3)
-#define IDDIG                           BIT(4)
 #endif  /* __MUSB_OMAP243X_H__ */
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 3969813c217d..464bd23cccda 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -1069,7 +1069,7 @@ static int tusb_musb_init(struct musb *musb)
         usb_nop_xceiv_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv))
-                return -ENODEV;
+                return -EPROBE_DEFER;
 
         pdev = to_platform_device(musb->controller);
 
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index a27ca1a9c994..13a392913769 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -61,7 +61,7 @@ static int ux500_musb_init(struct musb *musb)
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv)) {
                 pr_err("HS USB OTG: no transceiver configured\n");
-                return -ENODEV;
+                return -EPROBE_DEFER;
         }
 
         musb->isr = ux500_musb_interrupt;
@@ -108,7 +108,7 @@ static int ux500_probe(struct platform_device *pdev)
                 goto err3;
         }
 
-        ret = clk_enable(clk);
+        ret = clk_prepare_enable(clk);
         if (ret) {
                 dev_err(&pdev->dev, "failed to enable clock\n");
                 goto err4;
@@ -148,7 +148,7 @@ static int ux500_probe(struct platform_device *pdev)
         return 0;
 
 err5:
-        clk_disable(clk);
+        clk_disable_unprepare(clk);
 
 err4:
         clk_put(clk);
@@ -168,7 +168,7 @@ static int ux500_remove(struct platform_device *pdev)
         struct ux500_glue       *glue = platform_get_drvdata(pdev);
 
         platform_device_unregister(glue->musb);
-        clk_disable(glue->clk);
+        clk_disable_unprepare(glue->clk);
         clk_put(glue->clk);
         kfree(glue);
 
@@ -182,7 +182,7 @@ static int ux500_suspend(struct device *dev)
         struct musb             *musb = glue_to_musb(glue);
 
         usb_phy_set_suspend(musb->xceiv, 1);
-        clk_disable(glue->clk);
+        clk_disable_unprepare(glue->clk);
 
         return 0;
 }
@@ -193,7 +193,7 @@ static int ux500_resume(struct device *dev)
         struct musb             *musb = glue_to_musb(glue);
         int                     ret;
 
-        ret = clk_enable(glue->clk);
+        ret = clk_prepare_enable(glue->clk);
         if (ret) {
                 dev_err(dev, "failed to enable clock\n");
                 return ret;
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c
index eace975991a8..b6a9be31133b 100644
--- a/drivers/usb/otg/mv_otg.c
+++ b/drivers/usb/otg/mv_otg.c
@@ -420,7 +420,7 @@ static void mv_otg_work(struct work_struct *work)
         struct usb_otg *otg;
         int old_state;
 
-        mvotg = container_of((struct delayed_work *)work, struct mv_otg, work);
+        mvotg = container_of(to_delayed_work(work), struct mv_otg, work);
 
 run:
         /* work queue is single thread, or we need spin_lock to protect */
@@ -662,18 +662,9 @@ static struct attribute_group inputs_attr_group = {
 int mv_otg_remove(struct platform_device *pdev)
 {
         struct mv_otg *mvotg = platform_get_drvdata(pdev);
-        int clk_i;
 
         sysfs_remove_group(&mvotg->pdev->dev.kobj, &inputs_attr_group);
 
-        if (mvotg->irq)
-                free_irq(mvotg->irq, mvotg);
-
-        if (mvotg->pdata->vbus)
-                free_irq(mvotg->pdata->vbus->irq, mvotg);
-        if (mvotg->pdata->id)
-                free_irq(mvotg->pdata->id->irq, mvotg);
-
         if (mvotg->qwork) {
                 flush_workqueue(mvotg->qwork);
                 destroy_workqueue(mvotg->qwork);
@@ -681,21 +672,9 @@ int mv_otg_remove(struct platform_device *pdev)
 
         mv_otg_disable(mvotg);
 
-        if (mvotg->cap_regs)
-                iounmap(mvotg->cap_regs);
-
-        if (mvotg->phy_regs)
-                iounmap(mvotg->phy_regs);
-
-        for (clk_i = 0; clk_i <= mvotg->clknum; clk_i++)
-                clk_put(mvotg->clk[clk_i]);
-
         usb_remove_phy(&mvotg->phy);
         platform_set_drvdata(pdev, NULL);
 
-        kfree(mvotg->phy.otg);
-        kfree(mvotg);
-
         return 0;
 }
 
@@ -714,17 +693,15 @@ static int mv_otg_probe(struct platform_device *pdev)
         }
 
         size = sizeof(*mvotg) + sizeof(struct clk *) * pdata->clknum;
-        mvotg = kzalloc(size, GFP_KERNEL);
+        mvotg = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
         if (!mvotg) {
                 dev_err(&pdev->dev, "failed to allocate memory!\n");
                 return -ENOMEM;
         }
 
-        otg = kzalloc(sizeof *otg, GFP_KERNEL);
-        if (!otg) {
-                kfree(mvotg);
+        otg = devm_kzalloc(&pdev->dev, sizeof(*otg), GFP_KERNEL);
+        if (!otg)
                 return -ENOMEM;
-        }
 
         platform_set_drvdata(pdev, mvotg);
 
@@ -733,18 +710,18 @@ static int mv_otg_probe(struct platform_device *pdev)
 
         mvotg->clknum = pdata->clknum;
         for (clk_i = 0; clk_i < mvotg->clknum; clk_i++) {
-                mvotg->clk[clk_i] = clk_get(&pdev->dev, pdata->clkname[clk_i]);
+                mvotg->clk[clk_i] = devm_clk_get(&pdev->dev,
+                                                pdata->clkname[clk_i]);
                 if (IS_ERR(mvotg->clk[clk_i])) {
                         retval = PTR_ERR(mvotg->clk[clk_i]);
-                        goto err_put_clk;
+                        return retval;
                 }
         }
 
         mvotg->qwork = create_singlethread_workqueue("mv_otg_queue");
         if (!mvotg->qwork) {
                 dev_dbg(&pdev->dev, "cannot create workqueue for OTG\n");
-                retval = -ENOMEM;
-                goto err_put_clk;
+                return -ENOMEM;
         }
 
         INIT_DELAYED_WORK(&mvotg->work, mv_otg_work);
@@ -772,7 +749,7 @@ static int mv_otg_probe(struct platform_device *pdev)
                 goto err_destroy_workqueue;
         }
 
-        mvotg->phy_regs = ioremap(r->start, resource_size(r));
+        mvotg->phy_regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
         if (mvotg->phy_regs == NULL) {
                 dev_err(&pdev->dev, "failed to map phy I/O memory\n");
                 retval = -EFAULT;
@@ -784,21 +761,21 @@ static int mv_otg_probe(struct platform_device *pdev)
         if (r == NULL) {
                 dev_err(&pdev->dev, "no I/O memory resource defined\n");
                 retval = -ENODEV;
-                goto err_unmap_phyreg;
+                goto err_destroy_workqueue;
         }
 
-        mvotg->cap_regs = ioremap(r->start, resource_size(r));
+        mvotg->cap_regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
         if (mvotg->cap_regs == NULL) {
                 dev_err(&pdev->dev, "failed to map I/O memory\n");
                 retval = -EFAULT;
-                goto err_unmap_phyreg;
+                goto err_destroy_workqueue;
         }
 
         /* we will acces controller register, so enable the udc controller */
         retval = mv_otg_enable_internal(mvotg);
         if (retval) {
                 dev_err(&pdev->dev, "mv otg enable error %d\n", retval);
-                goto err_unmap_capreg;
+                goto err_destroy_workqueue;
         }
 
         mvotg->op_regs =
@@ -806,9 +783,9 @@ static int mv_otg_probe(struct platform_device *pdev)
                         + (readl(mvotg->cap_regs) & CAPLENGTH_MASK));
 
         if (pdata->id) {
-                retval = request_threaded_irq(pdata->id->irq, NULL,
-                                              mv_otg_inputs_irq,
-                                              IRQF_ONESHOT, "id", mvotg);
+                retval = devm_request_threaded_irq(&pdev->dev, pdata->id->irq,
+                                                NULL, mv_otg_inputs_irq,
+                                                IRQF_ONESHOT, "id", mvotg);
                 if (retval) {
                         dev_info(&pdev->dev,
                                  "Failed to request irq for ID\n");
@@ -818,9 +795,9 @@ static int mv_otg_probe(struct platform_device *pdev)
 
         if (pdata->vbus) {
                 mvotg->clock_gating = 1;
-                retval = request_threaded_irq(pdata->vbus->irq, NULL,
-                                              mv_otg_inputs_irq,
-                                              IRQF_ONESHOT, "vbus", mvotg);
+                retval = devm_request_threaded_irq(&pdev->dev, pdata->vbus->irq,
+                                                NULL, mv_otg_inputs_irq,
+                                                IRQF_ONESHOT, "vbus", mvotg);
                 if (retval) {
                         dev_info(&pdev->dev,
                                  "Failed to request irq for VBUS, "
@@ -844,7 +821,7 @@ static int mv_otg_probe(struct platform_device *pdev)
         }
 
         mvotg->irq = r->start;
-        if (request_irq(mvotg->irq, mv_otg_irq, IRQF_SHARED,
+        if (devm_request_irq(&pdev->dev, mvotg->irq, mv_otg_irq, IRQF_SHARED,
                         driver_name, mvotg)) {
                 dev_err(&pdev->dev, "Request irq %d for OTG failed\n",
                         mvotg->irq);
@@ -857,14 +834,14 @@ static int mv_otg_probe(struct platform_device *pdev)
         if (retval < 0) {
                 dev_err(&pdev->dev, "can't register transceiver, %d\n",
                         retval);
-                goto err_free_irq;
+                goto err_disable_clk;
         }
 
         retval = sysfs_create_group(&pdev->dev.kobj, &inputs_attr_group);
         if (retval < 0) {
                 dev_dbg(&pdev->dev,
                         "Can't register sysfs attr group: %d\n", retval);
-                goto err_set_transceiver;
+                goto err_remove_phy;
         }
 
         spin_lock_init(&mvotg->wq_lock);
@@ -879,30 +856,15 @@ static int mv_otg_probe(struct platform_device *pdev)
 
         return 0;
 
-err_set_transceiver:
+err_remove_phy:
         usb_remove_phy(&mvotg->phy);
-err_free_irq:
-        free_irq(mvotg->irq, mvotg);
 err_disable_clk:
-        if (pdata->vbus)
-                free_irq(pdata->vbus->irq, mvotg);
-        if (pdata->id)
-                free_irq(pdata->id->irq, mvotg);
         mv_otg_disable_internal(mvotg);
-err_unmap_capreg:
-        iounmap(mvotg->cap_regs);
-err_unmap_phyreg:
-        iounmap(mvotg->phy_regs);
 err_destroy_workqueue:
         flush_workqueue(mvotg->qwork);
         destroy_workqueue(mvotg->qwork);
-err_put_clk:
-        for (clk_i--; clk_i >= 0; clk_i--)
-                clk_put(mvotg->clk[clk_i]);
 
         platform_set_drvdata(pdev, NULL);
-        kfree(otg);
-        kfree(mvotg);
 
         return retval;
 }
diff --git a/drivers/usb/otg/mxs-phy.c b/drivers/usb/otg/mxs-phy.c
index 60df28a294b7..b0d9f119c749 100644
--- a/drivers/usb/otg/mxs-phy.c
+++ b/drivers/usb/otg/mxs-phy.c
@@ -76,6 +76,25 @@ static void mxs_phy_shutdown(struct usb_phy *phy)
         clk_disable_unprepare(mxs_phy->clk);
 }
 
+static int mxs_phy_suspend(struct usb_phy *x, int suspend)
+{
+        struct mxs_phy *mxs_phy = to_mxs_phy(x);
+
+        if (suspend) {
+                writel_relaxed(0xffffffff, x->io_priv + HW_USBPHY_PWD);
+                writel_relaxed(BM_USBPHY_CTRL_CLKGATE,
+                        x->io_priv + HW_USBPHY_CTRL_SET);
+                clk_disable_unprepare(mxs_phy->clk);
+        } else {
+                clk_prepare_enable(mxs_phy->clk);
+                writel_relaxed(BM_USBPHY_CTRL_CLKGATE,
+                        x->io_priv + HW_USBPHY_CTRL_CLR);
+                writel_relaxed(0, x->io_priv + HW_USBPHY_PWD);
+        }
+
+        return 0;
+}
+
 static int mxs_phy_on_connect(struct usb_phy *phy,
                 enum usb_device_speed speed)
 {
@@ -137,6 +156,7 @@ static int mxs_phy_probe(struct platform_device *pdev)
         mxs_phy->phy.label              = DRIVER_NAME;
         mxs_phy->phy.init               = mxs_phy_init;
         mxs_phy->phy.shutdown           = mxs_phy_shutdown;
+        mxs_phy->phy.set_suspend        = mxs_phy_suspend;
         mxs_phy->phy.notify_connect     = mxs_phy_on_connect;
         mxs_phy->phy.notify_disconnect  = mxs_phy_on_disconnect;
 
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c
index a30c04115115..e1814397ca3a 100644
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
@@ -13,11 +13,14 @@
 #include <linux/export.h>
 #include <linux/err.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #include <linux/usb/otg.h>
 
 static LIST_HEAD(phy_list);
+static LIST_HEAD(phy_bind_list);
 static DEFINE_SPINLOCK(phy_lock);
 
 static struct usb_phy *__usb_find_phy(struct list_head *list,
@@ -35,6 +38,38 @@ static struct usb_phy *__usb_find_phy(struct list_head *list,
         return ERR_PTR(-ENODEV);
 }
 
+static struct usb_phy *__usb_find_phy_dev(struct device *dev,
+        struct list_head *list, u8 index)
+{
+        struct usb_phy_bind *phy_bind = NULL;
+
+        list_for_each_entry(phy_bind, list, list) {
+                if (!(strcmp(phy_bind->dev_name, dev_name(dev))) &&
+                                phy_bind->index == index) {
+                        if (phy_bind->phy)
+                                return phy_bind->phy;
+                        else
+                                return ERR_PTR(-EPROBE_DEFER);
+                }
+        }
+
+        return ERR_PTR(-ENODEV);
+}
+
+static struct usb_phy *__of_usb_find_phy(struct device_node *node)
+{
+        struct usb_phy  *phy;
+
+        list_for_each_entry(phy, &phy_list, head) {
+                if (node != phy->dev->of_node)
+                        continue;
+
+                return phy;
+        }
+
+        return ERR_PTR(-ENODEV);
+}
+
 static void devm_usb_phy_release(struct device *dev, void *res)
 {
         struct usb_phy *phy = *(struct usb_phy **)res;
@@ -110,6 +145,133 @@ err0:
 }
 EXPORT_SYMBOL(usb_get_phy);
 
+ /**
+ * devm_usb_get_phy_by_phandle - find the USB PHY by phandle
+ * @dev - device that requests this phy
+ * @phandle - name of the property holding the phy phandle value
+ * @index - the index of the phy
+ *
+ * Returns the phy driver associated with the given phandle value,
+ * after getting a refcount to it, -ENODEV if there is no such phy or
+ * -EPROBE_DEFER if there is a phandle to the phy, but the device is
+ * not yet loaded. While at that, it also associates the device with
+ * the phy using devres. On driver detach, release function is invoked
+ * on the devres data, then, devres data is freed.
+ *
+ * For use by USB host and peripheral drivers.
+ */
+struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
+        const char *phandle, u8 index)
+{
+        struct usb_phy  *phy = ERR_PTR(-ENOMEM), **ptr;
+        unsigned long   flags;
+        struct device_node *node;
+
+        if (!dev->of_node) {
+                dev_dbg(dev, "device does not have a device node entry\n");
+                return ERR_PTR(-EINVAL);
+        }
+
+        node = of_parse_phandle(dev->of_node, phandle, index);
+        if (!node) {
+                dev_dbg(dev, "failed to get %s phandle in %s node\n", phandle,
+                        dev->of_node->full_name);
+                return ERR_PTR(-ENODEV);
+        }
+
+        ptr = devres_alloc(devm_usb_phy_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr) {
+                dev_dbg(dev, "failed to allocate memory for devres\n");
+                goto err0;
+        }
+
+        spin_lock_irqsave(&phy_lock, flags);
+
+        phy = __of_usb_find_phy(node);
+        if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
+                phy = ERR_PTR(-EPROBE_DEFER);
+                devres_free(ptr);
+                goto err1;
+        }
+
+        *ptr = phy;
+        devres_add(dev, ptr);
+
+        get_device(phy->dev);
+
+err1:
+        spin_unlock_irqrestore(&phy_lock, flags);
+
+err0:
+        of_node_put(node);
+
+        return phy;
+}
+EXPORT_SYMBOL(devm_usb_get_phy_by_phandle);
+
+/**
+ * usb_get_phy_dev - find the USB PHY
+ * @dev - device that requests this phy
+ * @index - the index of the phy
+ *
+ * Returns the phy driver, after getting a refcount to it; or
+ * -ENODEV if there is no such phy.  The caller is responsible for
+ * calling usb_put_phy() to release that count.
+ *
+ * For use by USB host and peripheral drivers.
+ */
+struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index)
+{
+        struct usb_phy  *phy = NULL;
+        unsigned long   flags;
+
+        spin_lock_irqsave(&phy_lock, flags);
+
+        phy = __usb_find_phy_dev(dev, &phy_bind_list, index);
+        if (IS_ERR(phy)) {
+                pr_err("unable to find transceiver\n");
+                goto err0;
+        }
+
+        get_device(phy->dev);
+
+err0:
+        spin_unlock_irqrestore(&phy_lock, flags);
+
+        return phy;
+}
+EXPORT_SYMBOL(usb_get_phy_dev);
+
+/**
+ * devm_usb_get_phy_dev - find the USB PHY using device ptr and index
+ * @dev - device that requests this phy
+ * @index - the index of the phy
+ *
+ * Gets the phy using usb_get_phy_dev(), and associates a device with it using
+ * devres. On driver detach, release function is invoked on the devres data,
+ * then, devres data is freed.
+ *
+ * For use by USB host and peripheral drivers.
+ */
+struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index)
+{
+        struct usb_phy **ptr, *phy;
+
+        ptr = devres_alloc(devm_usb_phy_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return NULL;
+
+        phy = usb_get_phy_dev(dev, index);
+        if (!IS_ERR(phy)) {
+                *ptr = phy;
+                devres_add(dev, ptr);
+        } else
+                devres_free(ptr);
+
+        return phy;
+}
+EXPORT_SYMBOL(devm_usb_get_phy_dev);
+
 /**
  * devm_usb_put_phy - release the USB PHY
  * @dev - device that wants to release this phy
@@ -185,6 +347,36 @@ out:
 EXPORT_SYMBOL(usb_add_phy);
 
 /**
+ * usb_add_phy_dev - declare the USB PHY
+ * @x: the USB phy to be used; or NULL
+ *
+ * This call is exclusively for use by phy drivers, which
+ * coordinate the activities of drivers for host and peripheral
+ * controllers, and in some cases for VBUS current regulation.
+ */
+int usb_add_phy_dev(struct usb_phy *x)
+{
+        struct usb_phy_bind *phy_bind;
+        unsigned long flags;
+
+        if (!x->dev) {
+                dev_err(x->dev, "no device provided for PHY\n");
+                return -EINVAL;
+        }
+
+        spin_lock_irqsave(&phy_lock, flags);
+        list_for_each_entry(phy_bind, &phy_bind_list, list)
+                if (!(strcmp(phy_bind->phy_dev_name, dev_name(x->dev))))
+                        phy_bind->phy = x;
+
+        list_add_tail(&x->head, &phy_list);
+
+        spin_unlock_irqrestore(&phy_lock, flags);
+        return 0;
+}
+EXPORT_SYMBOL(usb_add_phy_dev);
+
+/**
  * usb_remove_phy - remove the OTG PHY
  * @x: the USB OTG PHY to be removed;
  *
@@ -193,14 +385,55 @@ EXPORT_SYMBOL(usb_add_phy);
 void usb_remove_phy(struct usb_phy *x)
 {
         unsigned long   flags;
+        struct usb_phy_bind *phy_bind;
 
         spin_lock_irqsave(&phy_lock, flags);
-        if (x)
+        if (x) {
+                list_for_each_entry(phy_bind, &phy_bind_list, list)
+                        if (phy_bind->phy == x)
+                                phy_bind->phy = NULL;
                 list_del(&x->head);
+        }
         spin_unlock_irqrestore(&phy_lock, flags);
 }
 EXPORT_SYMBOL(usb_remove_phy);
 
+/**
+ * usb_bind_phy - bind the phy and the controller that uses the phy
+ * @dev_name: the device name of the device that will bind to the phy
+ * @index: index to specify the port number
+ * @phy_dev_name: the device name of the phy
+ *
+ * Fills the phy_bind structure with the dev_name and phy_dev_name. This will
+ * be used when the phy driver registers the phy and when the controller
+ * requests this phy.
+ *
+ * To be used by platform specific initialization code.
+ */
+int __init usb_bind_phy(const char *dev_name, u8 index,
+                                const char *phy_dev_name)
+{
+        struct usb_phy_bind *phy_bind;
+        unsigned long flags;
+
+        phy_bind = kzalloc(sizeof(*phy_bind), GFP_KERNEL);
+        if (!phy_bind) {
+                pr_err("phy_bind(): No memory for phy_bind");
+                return -ENOMEM;
+        }
+
+        phy_bind->dev_name = dev_name;
+        phy_bind->phy_dev_name = phy_dev_name;
+        phy_bind->index = index;
+
+        spin_lock_irqsave(&phy_lock, flags);
+        list_add_tail(&phy_bind->list, &phy_bind_list);
+        spin_unlock_irqrestore(&phy_lock, flags);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(usb_bind_phy);
+
 const char *otg_state_string(enum usb_otg_state state)
 {
         switch (state) {
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index 0a701938ab53..a994715a3101 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -610,6 +610,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
         twl->phy.dev            = twl->dev;
         twl->phy.label          = "twl4030";
         twl->phy.otg            = otg;
+        twl->phy.type           = USB_PHY_TYPE_USB2;
         twl->phy.set_suspend    = twl4030_set_suspend;
 
         otg->phy                = &twl->phy;
@@ -624,7 +625,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "ldo init failed\n");
                 return err;
         }
-        usb_add_phy(&twl->phy, USB_PHY_TYPE_USB2);
+        usb_add_phy_dev(&twl->phy);
 
         platform_set_drvdata(pdev, twl);
         if (device_create_file(&pdev->dev, &dev_attr_vbus))
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 5de6e7f39f9c..65217a590068 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -8,12 +8,32 @@ config OMAP_USB2
         tristate "OMAP USB2 PHY Driver"
         depends on ARCH_OMAP2PLUS
         select USB_OTG_UTILS
+        select OMAP_CONTROL_USB
         help
           Enable this to support the transceiver that is part of SOC. This
           driver takes care of all the PHY functionality apart from comparator.
           The USB OTG controller communicates with the comparator using this
           driver.
 
+config OMAP_USB3
+        tristate "OMAP USB3 PHY Driver"
+        select USB_OTG_UTILS
+        select OMAP_CONTROL_USB
+        help
+          Enable this to support the USB3 PHY that is part of SOC. This
+          driver takes care of all the PHY functionality apart from comparator.
+          This driver interacts with the "OMAP Control USB Driver" to power
+          on/off the PHY.
+
+config OMAP_CONTROL_USB
+        tristate "OMAP CONTROL USB Driver"
+        help
+          Enable this to add support for the USB part present in the control
+          module. This driver has API to power on the USB2 PHY and to write to
+          the mailbox. The mailbox is present only in omap4 and the register to
+          power on the USB2 PHY is present in OMAP4 and OMAP5. OMAP5 has an
+          additional register to power on USB3 PHY.
+
 config USB_ISP1301
         tristate "NXP ISP1301 USB transceiver support"
         depends on USB || USB_GADGET
@@ -45,3 +65,11 @@ config USB_RCAR_PHY
 
           To compile this driver as a module, choose M here: the
           module will be called rcar-phy.
+
+config SAMSUNG_USBPHY
+        bool "Samsung USB PHY controller Driver"
+        depends on USB_S3C_HSOTG || USB_EHCI_S5P || USB_OHCI_EXYNOS
+        select USB_OTG_UTILS
+        help
+          Enable this to support Samsung USB phy controller for samsung
+          SoCs.
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index 1a579a860a03..b13faa193e0c 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -5,7 +5,10 @@
 ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
 
 obj-$(CONFIG_OMAP_USB2)                 += omap-usb2.o
+obj-$(CONFIG_OMAP_USB3)                 += omap-usb3.o
+obj-$(CONFIG_OMAP_CONTROL_USB)          += omap-control-usb.o
 obj-$(CONFIG_USB_ISP1301)               += isp1301.o
 obj-$(CONFIG_MV_U3D_PHY)                += mv_u3d_phy.o
 obj-$(CONFIG_USB_EHCI_TEGRA)    += tegra_usb_phy.o
 obj-$(CONFIG_USB_RCAR_PHY)              += rcar-phy.o
+obj-$(CONFIG_SAMSUNG_USBPHY)            += samsung-usbphy.o
diff --git a/drivers/usb/phy/omap-control-usb.c b/drivers/usb/phy/omap-control-usb.c
new file mode 100644
index 000000000000..5323b71c3521
--- /dev/null
+++ b/drivers/usb/phy/omap-control-usb.c
@@ -0,0 +1,295 @@
+/*
+ * omap-control-usb.c - The USB part of control module.
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Author: Kishon Vijay Abraham I <kishon@ti.com>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/usb/omap_control_usb.h>
+
+static struct omap_control_usb *control_usb;
+
+/**
+ * omap_get_control_dev - returns the device pointer for this control device
+ *
+ * This API should be called to get the device pointer for this control
+ * module device. This device pointer should be used for called other
+ * exported API's in this driver.
+ *
+ * To be used by PHY driver and glue driver.
+ */
+struct device *omap_get_control_dev(void)
+{
+        if (!control_usb)
+                return ERR_PTR(-ENODEV);
+
+        return control_usb->dev;
+}
+EXPORT_SYMBOL_GPL(omap_get_control_dev);
+
+/**
+ * omap_control_usb3_phy_power - power on/off the serializer using control
+ *      module
+ * @dev: the control module device
+ * @on: 0 to off and 1 to on based on powering on or off the PHY
+ *
+ * usb3 PHY driver should call this API to power on or off the PHY.
+ */
+void omap_control_usb3_phy_power(struct device *dev, bool on)
+{
+        u32 val;
+        unsigned long rate;
+        struct omap_control_usb *control_usb = dev_get_drvdata(dev);
+
+        if (control_usb->type != OMAP_CTRL_DEV_TYPE2)
+                return;
+
+        rate = clk_get_rate(control_usb->sys_clk);
+        rate = rate/1000000;
+
+        val = readl(control_usb->phy_power);
+
+        if (on) {
+                val &= ~(OMAP_CTRL_USB_PWRCTL_CLK_CMD_MASK |
+                        OMAP_CTRL_USB_PWRCTL_CLK_FREQ_MASK);
+                val |= OMAP_CTRL_USB3_PHY_TX_RX_POWERON <<
+                        OMAP_CTRL_USB_PWRCTL_CLK_CMD_SHIFT;
+                val |= rate << OMAP_CTRL_USB_PWRCTL_CLK_FREQ_SHIFT;
+        } else {
+                val &= ~OMAP_CTRL_USB_PWRCTL_CLK_CMD_MASK;
+                val |= OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF <<
+                        OMAP_CTRL_USB_PWRCTL_CLK_CMD_SHIFT;
+        }
+
+        writel(val, control_usb->phy_power);
+}
+EXPORT_SYMBOL_GPL(omap_control_usb3_phy_power);
+
+/**
+ * omap_control_usb_phy_power - power on/off the phy using control module reg
+ * @dev: the control module device
+ * @on: 0 or 1, based on powering on or off the PHY
+ */
+void omap_control_usb_phy_power(struct device *dev, int on)
+{
+        u32 val;
+        struct omap_control_usb *control_usb = dev_get_drvdata(dev);
+
+        val = readl(control_usb->dev_conf);
+
+        if (on)
+                val &= ~OMAP_CTRL_DEV_PHY_PD;
+        else
+                val |= OMAP_CTRL_DEV_PHY_PD;
+
+        writel(val, control_usb->dev_conf);
+}
+EXPORT_SYMBOL_GPL(omap_control_usb_phy_power);
+
+/**
+ * omap_control_usb_host_mode - set AVALID, VBUSVALID and ID pin in grounded
+ * @ctrl_usb: struct omap_control_usb *
+ *
+ * Writes to the mailbox register to notify the usb core that a usb
+ * device has been connected.
+ */
+static void omap_control_usb_host_mode(struct omap_control_usb *ctrl_usb)
+{
+        u32 val;
+
+        val = readl(ctrl_usb->otghs_control);
+        val &= ~(OMAP_CTRL_DEV_IDDIG | OMAP_CTRL_DEV_SESSEND);
+        val |= OMAP_CTRL_DEV_AVALID | OMAP_CTRL_DEV_VBUSVALID;
+        writel(val, ctrl_usb->otghs_control);
+}
+
+/**
+ * omap_control_usb_device_mode - set AVALID, VBUSVALID and ID pin in high
+ * impedance
+ * @ctrl_usb: struct omap_control_usb *
+ *
+ * Writes to the mailbox register to notify the usb core that it has been
+ * connected to a usb host.
+ */
+static void omap_control_usb_device_mode(struct omap_control_usb *ctrl_usb)
+{
+        u32 val;
+
+        val = readl(ctrl_usb->otghs_control);
+        val &= ~OMAP_CTRL_DEV_SESSEND;
+        val |= OMAP_CTRL_DEV_IDDIG | OMAP_CTRL_DEV_AVALID |
+                OMAP_CTRL_DEV_VBUSVALID;
+        writel(val, ctrl_usb->otghs_control);
+}
+
+/**
+ * omap_control_usb_set_sessionend - Enable SESSIONEND and IDIG to high
+ * impedance
+ * @ctrl_usb: struct omap_control_usb *
+ *
+ * Writes to the mailbox register to notify the usb core it's now in
+ * disconnected state.
+ */
+static void omap_control_usb_set_sessionend(struct omap_control_usb *ctrl_usb)
+{
+        u32 val;
+
+        val = readl(ctrl_usb->otghs_control);
+        val &= ~(OMAP_CTRL_DEV_AVALID | OMAP_CTRL_DEV_VBUSVALID);
+        val |= OMAP_CTRL_DEV_IDDIG | OMAP_CTRL_DEV_SESSEND;
+        writel(val, ctrl_usb->otghs_control);
+}
+
+/**
+ * omap_control_usb_set_mode - Calls to functions to set USB in one of host mode
+ * or device mode or to denote disconnected state
+ * @dev: the control module device
+ * @mode: The mode to which usb should be configured
+ *
+ * This is an API to write to the mailbox register to notify the usb core that
+ * a usb device has been connected.
+ */
+void omap_control_usb_set_mode(struct device *dev,
+        enum omap_control_usb_mode mode)
+{
+        struct omap_control_usb *ctrl_usb;
+
+        if (IS_ERR(dev) || control_usb->type != OMAP_CTRL_DEV_TYPE1)
+                return;
+
+        ctrl_usb = dev_get_drvdata(dev);
+
+        switch (mode) {
+        case USB_MODE_HOST:
+                omap_control_usb_host_mode(ctrl_usb);
+                break;
+        case USB_MODE_DEVICE:
+                omap_control_usb_device_mode(ctrl_usb);
+                break;
+        case USB_MODE_DISCONNECT:
+                omap_control_usb_set_sessionend(ctrl_usb);
+                break;
+        default:
+                dev_vdbg(dev, "invalid omap control usb mode\n");
+        }
+}
+EXPORT_SYMBOL_GPL(omap_control_usb_set_mode);
+
+static int omap_control_usb_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        struct device_node *np = pdev->dev.of_node;
+        struct omap_control_usb_platform_data *pdata = pdev->dev.platform_data;
+
+        control_usb = devm_kzalloc(&pdev->dev, sizeof(*control_usb),
+                GFP_KERNEL);
+        if (!control_usb) {
+                dev_err(&pdev->dev, "unable to alloc memory for control usb\n");
+                return -ENOMEM;
+        }
+
+        if (np) {
+                of_property_read_u32(np, "ti,type", &control_usb->type);
+        } else if (pdata) {
+                control_usb->type = pdata->type;
+        } else {
+                dev_err(&pdev->dev, "no pdata present\n");
+                return -EINVAL;
+        }
+
+        control_usb->dev        = &pdev->dev;
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                "control_dev_conf");
+        control_usb->dev_conf = devm_request_and_ioremap(&pdev->dev, res);
+        if (!control_usb->dev_conf) {
+                dev_err(&pdev->dev, "Failed to obtain io memory\n");
+                return -EADDRNOTAVAIL;
+        }
+
+        if (control_usb->type == OMAP_CTRL_DEV_TYPE1) {
+                res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                        "otghs_control");
+                control_usb->otghs_control = devm_request_and_ioremap(
+                        &pdev->dev, res);
+                if (!control_usb->otghs_control) {
+                        dev_err(&pdev->dev, "Failed to obtain io memory\n");
+                        return -EADDRNOTAVAIL;
+                }
+        }
+
+        if (control_usb->type == OMAP_CTRL_DEV_TYPE2) {
+                res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                        "phy_power_usb");
+                control_usb->phy_power = devm_request_and_ioremap(
+                        &pdev->dev, res);
+                if (!control_usb->phy_power) {
+                        dev_dbg(&pdev->dev, "Failed to obtain io memory\n");
+                        return -EADDRNOTAVAIL;
+                }
+
+                control_usb->sys_clk = devm_clk_get(control_usb->dev,
+                        "sys_clkin");
+                if (IS_ERR(control_usb->sys_clk)) {
+                        pr_err("%s: unable to get sys_clkin\n", __func__);
+                        return -EINVAL;
+                }
+        }
+
+
+        dev_set_drvdata(control_usb->dev, control_usb);
+
+        return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id omap_control_usb_id_table[] = {
+        { .compatible = "ti,omap-control-usb" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, omap_control_usb_id_table);
+#endif
+
+static struct platform_driver omap_control_usb_driver = {
+        .probe          = omap_control_usb_probe,
+        .driver         = {
+                .name   = "omap-control-usb",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(omap_control_usb_id_table),
+        },
+};
+
+static int __init omap_control_usb_init(void)
+{
+        return platform_driver_register(&omap_control_usb_driver);
+}
+subsys_initcall(omap_control_usb_init);
+
+static void __exit omap_control_usb_exit(void)
+{
+        platform_driver_unregister(&omap_control_usb_driver);
+}
+module_exit(omap_control_usb_exit);
+
+MODULE_ALIAS("platform: omap_control_usb");
+MODULE_AUTHOR("Texas Instruments Inc.");
+MODULE_DESCRIPTION("OMAP Control Module USB Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/phy/omap-usb2.c b/drivers/usb/phy/omap-usb2.c
index 2fdb8ede5f1c..844ab68f08d0 100644
--- a/drivers/usb/phy/omap-usb2.c
+++ b/drivers/usb/phy/omap-usb2.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <linux/pm_runtime.h>
 #include <linux/delay.h>
+#include <linux/usb/omap_control_usb.h>
 
 /**
  * omap_usb2_set_comparator - links the comparator present in the sytem with
@@ -52,29 +53,6 @@ int omap_usb2_set_comparator(struct phy_companion *comparator)
 }
 EXPORT_SYMBOL_GPL(omap_usb2_set_comparator);
 
-/**
- * omap_usb_phy_power - power on/off the phy using control module reg
- * @phy: struct omap_usb *
- * @on: 0 or 1, based on powering on or off the PHY
- *
- * XXX: Remove this function once control module driver gets merged
- */
-static void omap_usb_phy_power(struct omap_usb *phy, int on)
-{
-        u32 val;
-
-        if (on) {
-                val = readl(phy->control_dev);
-                if (val & PHY_PD) {
-                        writel(~PHY_PD, phy->control_dev);
-                        /* XXX: add proper documentation for this delay */
-                        mdelay(200);
-                }
-        } else {
-                writel(PHY_PD, phy->control_dev);
-        }
-}
-
 static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled)
 {
         struct omap_usb *phy = phy_to_omapusb(otg->phy);
@@ -124,7 +102,7 @@ static int omap_usb2_suspend(struct usb_phy *x, int suspend)
         struct omap_usb *phy = phy_to_omapusb(x);
 
         if (suspend && !phy->is_suspended) {
-                omap_usb_phy_power(phy, 0);
+                omap_control_usb_phy_power(phy->control_dev, 0);
                 pm_runtime_put_sync(phy->dev);
                 phy->is_suspended = 1;
         } else if (!suspend && phy->is_suspended) {
@@ -134,7 +112,7 @@ static int omap_usb2_suspend(struct usb_phy *x, int suspend)
                                                                         ret);
                         return ret;
                 }
-                omap_usb_phy_power(phy, 1);
+                omap_control_usb_phy_power(phy->control_dev, 1);
                 phy->is_suspended = 0;
         }
 
@@ -145,7 +123,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
 {
         struct omap_usb                 *phy;
         struct usb_otg                  *otg;
-        struct resource                 *res;
 
         phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
         if (!phy) {
@@ -165,15 +142,16 @@ static int omap_usb2_probe(struct platform_device *pdev)
         phy->phy.label          = "omap-usb2";
         phy->phy.set_suspend    = omap_usb2_suspend;
         phy->phy.otg            = otg;
+        phy->phy.type           = USB_PHY_TYPE_USB2;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-
-        phy->control_dev = devm_ioremap_resource(&pdev->dev, res);
-        if (IS_ERR(phy->control_dev))
-                return PTR_ERR(phy->control_dev);
+        phy->control_dev = omap_get_control_dev();
+        if (IS_ERR(phy->control_dev)) {
+                dev_dbg(&pdev->dev, "Failed to get control device\n");
+                return -ENODEV;
+        }
 
         phy->is_suspended       = 1;
-        omap_usb_phy_power(phy, 0);
+        omap_control_usb_phy_power(phy->control_dev, 0);
 
         otg->set_host           = omap_usb_set_host;
         otg->set_peripheral     = omap_usb_set_peripheral;
@@ -188,7 +166,13 @@ static int omap_usb2_probe(struct platform_device *pdev)
         }
         clk_prepare(phy->wkupclk);
 
-        usb_add_phy(&phy->phy, USB_PHY_TYPE_USB2);
+        phy->optclk = devm_clk_get(phy->dev, "usb_otg_ss_refclk960m");
+        if (IS_ERR(phy->optclk))
+                dev_vdbg(&pdev->dev, "unable to get refclk960m\n");
+        else
+                clk_prepare(phy->optclk);
+
+        usb_add_phy_dev(&phy->phy);
 
         platform_set_drvdata(pdev, phy);
 
@@ -202,6 +186,8 @@ static int omap_usb2_remove(struct platform_device *pdev)
         struct omap_usb *phy = platform_get_drvdata(pdev);
 
         clk_unprepare(phy->wkupclk);
+        if (!IS_ERR(phy->optclk))
+                clk_unprepare(phy->optclk);
         usb_remove_phy(&phy->phy);
 
         return 0;
@@ -215,6 +201,8 @@ static int omap_usb2_runtime_suspend(struct device *dev)
         struct omap_usb *phy = platform_get_drvdata(pdev);
 
         clk_disable(phy->wkupclk);
+        if (!IS_ERR(phy->optclk))
+                clk_disable(phy->optclk);
 
         return 0;
 }
@@ -226,9 +214,25 @@ static int omap_usb2_runtime_resume(struct device *dev)
         struct omap_usb *phy = platform_get_drvdata(pdev);
 
         ret = clk_enable(phy->wkupclk);
-        if (ret < 0)
+        if (ret < 0) {
                 dev_err(phy->dev, "Failed to enable wkupclk %d\n", ret);
+                goto err0;
+        }
+
+        if (!IS_ERR(phy->optclk)) {
+                ret = clk_enable(phy->optclk);
+                if (ret < 0) {
+                        dev_err(phy->dev, "Failed to enable optclk %d\n", ret);
+                        goto err1;
+                }
+        }
+
+        return 0;
+
+err1:
+        clk_disable(phy->wkupclk);
 
+err0:
         return ret;
 }
 
diff --git a/drivers/usb/phy/omap-usb3.c b/drivers/usb/phy/omap-usb3.c
new file mode 100644
index 000000000000..fadc0c2b65bb
--- /dev/null
+++ b/drivers/usb/phy/omap-usb3.c
@@ -0,0 +1,355 @@
+/*
+ * omap-usb3 - USB PHY, talking to dwc3 controller in OMAP.
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Author: Kishon Vijay Abraham I <kishon@ti.com>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/usb/omap_usb.h>
+#include <linux/of.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/pm_runtime.h>
+#include <linux/delay.h>
+#include <linux/usb/omap_control_usb.h>
+
+#define NUM_SYS_CLKS            5
+#define PLL_STATUS              0x00000004
+#define PLL_GO                  0x00000008
+#define PLL_CONFIGURATION1      0x0000000C
+#define PLL_CONFIGURATION2      0x00000010
+#define PLL_CONFIGURATION3      0x00000014
+#define PLL_CONFIGURATION4      0x00000020
+
+#define PLL_REGM_MASK           0x001FFE00
+#define PLL_REGM_SHIFT          0x9
+#define PLL_REGM_F_MASK         0x0003FFFF
+#define PLL_REGM_F_SHIFT        0x0
+#define PLL_REGN_MASK           0x000001FE
+#define PLL_REGN_SHIFT          0x1
+#define PLL_SELFREQDCO_MASK     0x0000000E
+#define PLL_SELFREQDCO_SHIFT    0x1
+#define PLL_SD_MASK             0x0003FC00
+#define PLL_SD_SHIFT            0x9
+#define SET_PLL_GO              0x1
+#define PLL_TICOPWDN            0x10000
+#define PLL_LOCK                0x2
+#define PLL_IDLE                0x1
+
+/*
+ * This is an Empirical value that works, need to confirm the actual
+ * value required for the USB3PHY_PLL_CONFIGURATION2.PLL_IDLE status
+ * to be correctly reflected in the USB3PHY_PLL_STATUS register.
+ */
+# define PLL_IDLE_TIME  100;
+
+enum sys_clk_rate {
+        CLK_RATE_UNDEFINED = -1,
+        CLK_RATE_12MHZ,
+        CLK_RATE_16MHZ,
+        CLK_RATE_19MHZ,
+        CLK_RATE_26MHZ,
+        CLK_RATE_38MHZ
+};
+
+static struct usb_dpll_params omap_usb3_dpll_params[NUM_SYS_CLKS] = {
+        {1250, 5, 4, 20, 0},            /* 12 MHz */
+        {3125, 20, 4, 20, 0},           /* 16.8 MHz */
+        {1172, 8, 4, 20, 65537},        /* 19.2 MHz */
+        {1250, 12, 4, 20, 0},           /* 26 MHz */
+        {3125, 47, 4, 20, 92843},       /* 38.4 MHz */
+};
+
+static int omap_usb3_suspend(struct usb_phy *x, int suspend)
+{
+        struct omap_usb *phy = phy_to_omapusb(x);
+        int     val;
+        int timeout = PLL_IDLE_TIME;
+
+        if (suspend && !phy->is_suspended) {
+                val = omap_usb_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);
+                val |= PLL_IDLE;
+                omap_usb_writel(phy->pll_ctrl_base, PLL_CONFIGURATION2, val);
+
+                do {
+                        val = omap_usb_readl(phy->pll_ctrl_base, PLL_STATUS);
+                        if (val & PLL_TICOPWDN)
+                                break;
+                        udelay(1);
+                } while (--timeout);
+
+                omap_control_usb3_phy_power(phy->control_dev, 0);
+
+                phy->is_suspended       = 1;
+        } else if (!suspend && phy->is_suspended) {
+                phy->is_suspended       = 0;
+
+                val = omap_usb_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);
+                val &= ~PLL_IDLE;
+                omap_usb_writel(phy->pll_ctrl_base, PLL_CONFIGURATION2, val);
+
+                do {
+                        val = omap_usb_readl(phy->pll_ctrl_base, PLL_STATUS);
+                        if (!(val & PLL_TICOPWDN))
+                                break;
+                        udelay(1);
+                } while (--timeout);
+        }
+
+        return 0;
+}
+
+static inline enum sys_clk_rate __get_sys_clk_index(unsigned long rate)
+{
+        switch (rate) {
+        case 12000000:
+                return CLK_RATE_12MHZ;
+        case 16800000:
+                return CLK_RATE_16MHZ;
+        case 19200000:
+                return CLK_RATE_19MHZ;
+        case 26000000:
+                return CLK_RATE_26MHZ;
+        case 38400000:
+                return CLK_RATE_38MHZ;
+        default:
+                return CLK_RATE_UNDEFINED;
+        }
+}
+
+static void omap_usb_dpll_relock(struct omap_usb *phy)
+{
+        u32             val;
+        unsigned long   timeout;
+
+        omap_usb_writel(phy->pll_ctrl_base, PLL_GO, SET_PLL_GO);
+
+        timeout = jiffies + msecs_to_jiffies(20);
+        do {
+                val = omap_usb_readl(phy->pll_ctrl_base, PLL_STATUS);
+                if (val & PLL_LOCK)
+                        break;
+        } while (!WARN_ON(time_after(jiffies, timeout)));
+}
+
+static int omap_usb_dpll_lock(struct omap_usb *phy)
+{
+        u32                     val;
+        unsigned long           rate;
+        enum sys_clk_rate       clk_index;
+
+        rate            = clk_get_rate(phy->sys_clk);
+        clk_index       = __get_sys_clk_index(rate);
+
+        if (clk_index == CLK_RATE_UNDEFINED) {
+                pr_err("dpll cannot be locked for sys clk freq:%luHz\n", rate);
+                return -EINVAL;
+        }
+
+        val = omap_usb_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1);
+        val &= ~PLL_REGN_MASK;
+        val |= omap_usb3_dpll_params[clk_index].n << PLL_REGN_SHIFT;
+        omap_usb_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val);
+
+        val = omap_usb_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);
+        val &= ~PLL_SELFREQDCO_MASK;
+        val |= omap_usb3_dpll_params[clk_index].freq << PLL_SELFREQDCO_SHIFT;
+        omap_usb_writel(phy->pll_ctrl_base, PLL_CONFIGURATION2, val);
+
+        val = omap_usb_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1);
+        val &= ~PLL_REGM_MASK;
+        val |= omap_usb3_dpll_params[clk_index].m << PLL_REGM_SHIFT;
+        omap_usb_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val);
+
+        val = omap_usb_readl(phy->pll_ctrl_base, PLL_CONFIGURATION4);
+        val &= ~PLL_REGM_F_MASK;
+        val |= omap_usb3_dpll_params[clk_index].mf << PLL_REGM_F_SHIFT;
+        omap_usb_writel(phy->pll_ctrl_base, PLL_CONFIGURATION4, val);
+
+        val = omap_usb_readl(phy->pll_ctrl_base, PLL_CONFIGURATION3);
+        val &= ~PLL_SD_MASK;
+        val |= omap_usb3_dpll_params[clk_index].sd << PLL_SD_SHIFT;
+        omap_usb_writel(phy->pll_ctrl_base, PLL_CONFIGURATION3, val);
+
+        omap_usb_dpll_relock(phy);
+
+        return 0;
+}
+
+static int omap_usb3_init(struct usb_phy *x)
+{
+        struct omap_usb *phy = phy_to_omapusb(x);
+
+        omap_usb_dpll_lock(phy);
+        omap_control_usb3_phy_power(phy->control_dev, 1);
+
+        return 0;
+}
+
+static int omap_usb3_probe(struct platform_device *pdev)
+{
+        struct omap_usb                 *phy;
+        struct resource                 *res;
+
+        phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
+        if (!phy) {
+                dev_err(&pdev->dev, "unable to alloc mem for OMAP USB3 PHY\n");
+                return -ENOMEM;
+        }
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll_ctrl");
+        phy->pll_ctrl_base = devm_request_and_ioremap(&pdev->dev, res);
+        if (!phy->pll_ctrl_base) {
+                dev_err(&pdev->dev, "ioremap of pll_ctrl failed\n");
+                return -ENOMEM;
+        }
+
+        phy->dev                = &pdev->dev;
+
+        phy->phy.dev            = phy->dev;
+        phy->phy.label          = "omap-usb3";
+        phy->phy.init           = omap_usb3_init;
+        phy->phy.set_suspend    = omap_usb3_suspend;
+        phy->phy.type           = USB_PHY_TYPE_USB3;
+
+        phy->is_suspended       = 1;
+        phy->wkupclk = devm_clk_get(phy->dev, "usb_phy_cm_clk32k");
+        if (IS_ERR(phy->wkupclk)) {
+                dev_err(&pdev->dev, "unable to get usb_phy_cm_clk32k\n");
+                return PTR_ERR(phy->wkupclk);
+        }
+        clk_prepare(phy->wkupclk);
+
+        phy->optclk = devm_clk_get(phy->dev, "usb_otg_ss_refclk960m");
+        if (IS_ERR(phy->optclk)) {
+                dev_err(&pdev->dev, "unable to get usb_otg_ss_refclk960m\n");
+                return PTR_ERR(phy->optclk);
+        }
+        clk_prepare(phy->optclk);
+
+        phy->sys_clk = devm_clk_get(phy->dev, "sys_clkin");
+        if (IS_ERR(phy->sys_clk)) {
+                pr_err("%s: unable to get sys_clkin\n", __func__);
+                return -EINVAL;
+        }
+
+        phy->control_dev = omap_get_control_dev();
+        if (IS_ERR(phy->control_dev)) {
+                dev_dbg(&pdev->dev, "Failed to get control device\n");
+                return -ENODEV;
+        }
+
+        omap_control_usb3_phy_power(phy->control_dev, 0);
+        usb_add_phy_dev(&phy->phy);
+
+        platform_set_drvdata(pdev, phy);
+
+        pm_runtime_enable(phy->dev);
+        pm_runtime_get(&pdev->dev);
+
+        return 0;
+}
+
+static int omap_usb3_remove(struct platform_device *pdev)
+{
+        struct omap_usb *phy = platform_get_drvdata(pdev);
+
+        clk_unprepare(phy->wkupclk);
+        clk_unprepare(phy->optclk);
+        usb_remove_phy(&phy->phy);
+        if (!pm_runtime_suspended(&pdev->dev))
+                pm_runtime_put(&pdev->dev);
+        pm_runtime_disable(&pdev->dev);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_RUNTIME
+
+static int omap_usb3_runtime_suspend(struct device *dev)
+{
+        struct platform_device  *pdev = to_platform_device(dev);
+        struct omap_usb *phy = platform_get_drvdata(pdev);
+
+        clk_disable(phy->wkupclk);
+        clk_disable(phy->optclk);
+
+        return 0;
+}
+
+static int omap_usb3_runtime_resume(struct device *dev)
+{
+        u32 ret = 0;
+        struct platform_device  *pdev = to_platform_device(dev);
+        struct omap_usb *phy = platform_get_drvdata(pdev);
+
+        ret = clk_enable(phy->optclk);
+        if (ret) {
+                dev_err(phy->dev, "Failed to enable optclk %d\n", ret);
+                goto err1;
+        }
+
+        ret = clk_enable(phy->wkupclk);
+        if (ret) {
+                dev_err(phy->dev, "Failed to enable wkupclk %d\n", ret);
+                goto err2;
+        }
+
+        return 0;
+
+err2:
+        clk_disable(phy->optclk);
+
+err1:
+        return ret;
+}
+
+static const struct dev_pm_ops omap_usb3_pm_ops = {
+        SET_RUNTIME_PM_OPS(omap_usb3_runtime_suspend, omap_usb3_runtime_resume,
+                NULL)
+};
+
+#define DEV_PM_OPS     (&omap_usb3_pm_ops)
+#else
+#define DEV_PM_OPS     NULL
+#endif
+
+#ifdef CONFIG_OF
+static const struct of_device_id omap_usb3_id_table[] = {
+        { .compatible = "ti,omap-usb3" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, omap_usb3_id_table);
+#endif
+
+static struct platform_driver omap_usb3_driver = {
+        .probe          = omap_usb3_probe,
+        .remove         = omap_usb3_remove,
+        .driver         = {
+                .name   = "omap-usb3",
+                .owner  = THIS_MODULE,
+                .pm     = DEV_PM_OPS,
+                .of_match_table = of_match_ptr(omap_usb3_id_table),
+        },
+};
+
+module_platform_driver(omap_usb3_driver);
+
+MODULE_ALIAS("platform: omap_usb3");
+MODULE_AUTHOR("Texas Instruments Inc.");
+MODULE_DESCRIPTION("OMAP USB3 phy driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/phy/samsung-usbphy.c b/drivers/usb/phy/samsung-usbphy.c
new file mode 100644
index 000000000000..6ea553733832
--- /dev/null
+++ b/drivers/usb/phy/samsung-usbphy.c
@@ -0,0 +1,930 @@
+/* linux/drivers/usb/phy/samsung-usbphy.c
+ *
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * Author: Praveen Paneri <p.paneri@samsung.com>
+ *
+ * Samsung USB2.0 PHY transceiver; talks to S3C HS OTG controller, EHCI-S5P and
+ * OHCI-EXYNOS controllers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/samsung_usb_phy.h>
+#include <linux/platform_data/samsung-usbphy.h>
+
+/* Register definitions */
+
+#define SAMSUNG_PHYPWR                          (0x00)
+
+#define PHYPWR_NORMAL_MASK                      (0x19 << 0)
+#define PHYPWR_OTG_DISABLE                      (0x1 << 4)
+#define PHYPWR_ANALOG_POWERDOWN                 (0x1 << 3)
+#define PHYPWR_FORCE_SUSPEND                    (0x1 << 1)
+/* For Exynos4 */
+#define PHYPWR_NORMAL_MASK_PHY0                 (0x39 << 0)
+#define PHYPWR_SLEEP_PHY0                       (0x1 << 5)
+
+#define SAMSUNG_PHYCLK                          (0x04)
+
+#define PHYCLK_MODE_USB11                       (0x1 << 6)
+#define PHYCLK_EXT_OSC                          (0x1 << 5)
+#define PHYCLK_COMMON_ON_N                      (0x1 << 4)
+#define PHYCLK_ID_PULL                          (0x1 << 2)
+#define PHYCLK_CLKSEL_MASK                      (0x3 << 0)
+#define PHYCLK_CLKSEL_48M                       (0x0 << 0)
+#define PHYCLK_CLKSEL_12M                       (0x2 << 0)
+#define PHYCLK_CLKSEL_24M                       (0x3 << 0)
+
+#define SAMSUNG_RSTCON                          (0x08)
+
+#define RSTCON_PHYLINK_SWRST                    (0x1 << 2)
+#define RSTCON_HLINK_SWRST                      (0x1 << 1)
+#define RSTCON_SWRST                            (0x1 << 0)
+
+/* EXYNOS5 */
+#define EXYNOS5_PHY_HOST_CTRL0                  (0x00)
+
+#define HOST_CTRL0_PHYSWRSTALL                  (0x1 << 31)
+
+#define HOST_CTRL0_REFCLKSEL_MASK               (0x3 << 19)
+#define HOST_CTRL0_REFCLKSEL_XTAL               (0x0 << 19)
+#define HOST_CTRL0_REFCLKSEL_EXTL               (0x1 << 19)
+#define HOST_CTRL0_REFCLKSEL_CLKCORE            (0x2 << 19)
+
+#define HOST_CTRL0_FSEL_MASK                    (0x7 << 16)
+#define HOST_CTRL0_FSEL(_x)                     ((_x) << 16)
+
+#define FSEL_CLKSEL_50M                         (0x7)
+#define FSEL_CLKSEL_24M                         (0x5)
+#define FSEL_CLKSEL_20M                         (0x4)
+#define FSEL_CLKSEL_19200K                      (0x3)
+#define FSEL_CLKSEL_12M                         (0x2)
+#define FSEL_CLKSEL_10M                         (0x1)
+#define FSEL_CLKSEL_9600K                       (0x0)
+
+#define HOST_CTRL0_TESTBURNIN                   (0x1 << 11)
+#define HOST_CTRL0_RETENABLE                    (0x1 << 10)
+#define HOST_CTRL0_COMMONON_N                   (0x1 << 9)
+#define HOST_CTRL0_SIDDQ                        (0x1 << 6)
+#define HOST_CTRL0_FORCESLEEP                   (0x1 << 5)
+#define HOST_CTRL0_FORCESUSPEND                 (0x1 << 4)
+#define HOST_CTRL0_WORDINTERFACE                (0x1 << 3)
+#define HOST_CTRL0_UTMISWRST                    (0x1 << 2)
+#define HOST_CTRL0_LINKSWRST                    (0x1 << 1)
+#define HOST_CTRL0_PHYSWRST                     (0x1 << 0)
+
+#define EXYNOS5_PHY_HOST_TUNE0                  (0x04)
+
+#define EXYNOS5_PHY_HSIC_CTRL1                  (0x10)
+
+#define EXYNOS5_PHY_HSIC_TUNE1                  (0x14)
+
+#define EXYNOS5_PHY_HSIC_CTRL2                  (0x20)
+
+#define EXYNOS5_PHY_HSIC_TUNE2                  (0x24)
+
+#define HSIC_CTRL_REFCLKSEL_MASK                (0x3 << 23)
+#define HSIC_CTRL_REFCLKSEL                     (0x2 << 23)
+
+#define HSIC_CTRL_REFCLKDIV_MASK                (0x7f << 16)
+#define HSIC_CTRL_REFCLKDIV(_x)                 ((_x) << 16)
+#define HSIC_CTRL_REFCLKDIV_12                  (0x24 << 16)
+#define HSIC_CTRL_REFCLKDIV_15                  (0x1c << 16)
+#define HSIC_CTRL_REFCLKDIV_16                  (0x1a << 16)
+#define HSIC_CTRL_REFCLKDIV_19_2                (0x15 << 16)
+#define HSIC_CTRL_REFCLKDIV_20                  (0x14 << 16)
+
+#define HSIC_CTRL_SIDDQ                         (0x1 << 6)
+#define HSIC_CTRL_FORCESLEEP                    (0x1 << 5)
+#define HSIC_CTRL_FORCESUSPEND                  (0x1 << 4)
+#define HSIC_CTRL_WORDINTERFACE                 (0x1 << 3)
+#define HSIC_CTRL_UTMISWRST                     (0x1 << 2)
+#define HSIC_CTRL_PHYSWRST                      (0x1 << 0)
+
+#define EXYNOS5_PHY_HOST_EHCICTRL               (0x30)
+
+#define HOST_EHCICTRL_ENAINCRXALIGN             (0x1 << 29)
+#define HOST_EHCICTRL_ENAINCR4                  (0x1 << 28)
+#define HOST_EHCICTRL_ENAINCR8                  (0x1 << 27)
+#define HOST_EHCICTRL_ENAINCR16                 (0x1 << 26)
+
+#define EXYNOS5_PHY_HOST_OHCICTRL               (0x34)
+
+#define HOST_OHCICTRL_SUSPLGCY                  (0x1 << 3)
+#define HOST_OHCICTRL_APPSTARTCLK               (0x1 << 2)
+#define HOST_OHCICTRL_CNTSEL                    (0x1 << 1)
+#define HOST_OHCICTRL_CLKCKTRST                 (0x1 << 0)
+
+#define EXYNOS5_PHY_OTG_SYS                     (0x38)
+
+#define OTG_SYS_PHYLINK_SWRESET                 (0x1 << 14)
+#define OTG_SYS_LINKSWRST_UOTG                  (0x1 << 13)
+#define OTG_SYS_PHY0_SWRST                      (0x1 << 12)
+
+#define OTG_SYS_REFCLKSEL_MASK                  (0x3 << 9)
+#define OTG_SYS_REFCLKSEL_XTAL                  (0x0 << 9)
+#define OTG_SYS_REFCLKSEL_EXTL                  (0x1 << 9)
+#define OTG_SYS_REFCLKSEL_CLKCORE               (0x2 << 9)
+
+#define OTG_SYS_IDPULLUP_UOTG                   (0x1 << 8)
+#define OTG_SYS_COMMON_ON                       (0x1 << 7)
+
+#define OTG_SYS_FSEL_MASK                       (0x7 << 4)
+#define OTG_SYS_FSEL(_x)                        ((_x) << 4)
+
+#define OTG_SYS_FORCESLEEP                      (0x1 << 3)
+#define OTG_SYS_OTGDISABLE                      (0x1 << 2)
+#define OTG_SYS_SIDDQ_UOTG                      (0x1 << 1)
+#define OTG_SYS_FORCESUSPEND                    (0x1 << 0)
+
+#define EXYNOS5_PHY_OTG_TUNE                    (0x40)
+
+#ifndef MHZ
+#define MHZ (1000*1000)
+#endif
+
+#ifndef KHZ
+#define KHZ (1000)
+#endif
+
+#define EXYNOS_USBHOST_PHY_CTRL_OFFSET          (0x4)
+#define S3C64XX_USBPHY_ENABLE                   (0x1 << 16)
+#define EXYNOS_USBPHY_ENABLE                    (0x1 << 0)
+#define EXYNOS_USB20PHY_CFG_HOST_LINK           (0x1 << 0)
+
+enum samsung_cpu_type {
+        TYPE_S3C64XX,
+        TYPE_EXYNOS4210,
+        TYPE_EXYNOS5250,
+};
+
+/*
+ * struct samsung_usbphy_drvdata - driver data for various SoC variants
+ * @cpu_type: machine identifier
+ * @devphy_en_mask: device phy enable mask for PHY CONTROL register
+ * @hostphy_en_mask: host phy enable mask for PHY CONTROL register
+ * @devphy_reg_offset: offset to DEVICE PHY CONTROL register from
+ *                     mapped address of system controller.
+ * @hostphy_reg_offset: offset to HOST PHY CONTROL register from
+ *                     mapped address of system controller.
+ *
+ *      Here we have a separate mask for device type phy.
+ *      Having different masks for host and device type phy helps
+ *      in setting independent masks in case of SoCs like S5PV210,
+ *      in which PHY0 and PHY1 enable bits belong to same register
+ *      placed at position 0 and 1 respectively.
+ *      Although for newer SoCs like exynos these bits belong to
+ *      different registers altogether placed at position 0.
+ */
+struct samsung_usbphy_drvdata {
+        int cpu_type;
+        int devphy_en_mask;
+        int hostphy_en_mask;
+        u32 devphy_reg_offset;
+        u32 hostphy_reg_offset;
+};
+
+/*
+ * struct samsung_usbphy - transceiver driver state
+ * @phy: transceiver structure
+ * @plat: platform data
+ * @dev: The parent device supplied to the probe function
+ * @clk: usb phy clock
+ * @regs: usb phy controller registers memory base
+ * @pmuregs: USB device PHY_CONTROL register memory base
+ * @sysreg: USB2.0 PHY_CFG register memory base
+ * @ref_clk_freq: reference clock frequency selection
+ * @drv_data: driver data available for different SoCs
+ * @phy_type: Samsung SoCs specific phy types:  #HOST
+ *                                              #DEVICE
+ * @phy_usage: usage count for phy
+ * @lock: lock for phy operations
+ */
+struct samsung_usbphy {
+        struct usb_phy  phy;
+        struct samsung_usbphy_data *plat;
+        struct device   *dev;
+        struct clk      *clk;
+        void __iomem    *regs;
+        void __iomem    *pmuregs;
+        void __iomem    *sysreg;
+        int             ref_clk_freq;
+        const struct samsung_usbphy_drvdata *drv_data;
+        enum samsung_usb_phy_type phy_type;
+        atomic_t        phy_usage;
+        spinlock_t      lock;
+};
+
+#define phy_to_sphy(x)          container_of((x), struct samsung_usbphy, phy)
+
+int samsung_usbphy_set_host(struct usb_otg *otg, struct usb_bus *host)
+{
+        if (!otg)
+                return -ENODEV;
+
+        if (!otg->host)
+                otg->host = host;
+
+        return 0;
+}
+
+static int samsung_usbphy_parse_dt(struct samsung_usbphy *sphy)
+{
+        struct device_node *usbphy_sys;
+
+        /* Getting node for system controller interface for usb-phy */
+        usbphy_sys = of_get_child_by_name(sphy->dev->of_node, "usbphy-sys");
+        if (!usbphy_sys) {
+                dev_err(sphy->dev, "No sys-controller interface for usb-phy\n");
+                return -ENODEV;
+        }
+
+        sphy->pmuregs = of_iomap(usbphy_sys, 0);
+
+        if (sphy->pmuregs == NULL) {
+                dev_err(sphy->dev, "Can't get usb-phy pmu control register\n");
+                goto err0;
+        }
+
+        sphy->sysreg = of_iomap(usbphy_sys, 1);
+
+        /*
+         * Not returning error code here, since this situation is not fatal.
+         * Few SoCs may not have this switch available
+         */
+        if (sphy->sysreg == NULL)
+                dev_warn(sphy->dev, "Can't get usb-phy sysreg cfg register\n");
+
+        of_node_put(usbphy_sys);
+
+        return 0;
+
+err0:
+        of_node_put(usbphy_sys);
+        return -ENXIO;
+}
+
+/*
+ * Set isolation here for phy.
+ * Here 'on = true' would mean USB PHY block is isolated, hence
+ * de-activated and vice-versa.
+ */
+static void samsung_usbphy_set_isolation(struct samsung_usbphy *sphy, bool on)
+{
+        void __iomem *reg = NULL;
+        u32 reg_val;
+        u32 en_mask = 0;
+
+        if (!sphy->pmuregs) {
+                dev_warn(sphy->dev, "Can't set pmu isolation\n");
+                return;
+        }
+
+        switch (sphy->drv_data->cpu_type) {
+        case TYPE_S3C64XX:
+                /*
+                 * Do nothing: We will add here once S3C64xx goes for DT support
+                 */
+                break;
+        case TYPE_EXYNOS4210:
+                /*
+                 * Fall through since exynos4210 and exynos5250 have similar
+                 * register architecture: two separate registers for host and
+                 * device phy control with enable bit at position 0.
+                 */
+        case TYPE_EXYNOS5250:
+                if (sphy->phy_type == USB_PHY_TYPE_DEVICE) {
+                        reg = sphy->pmuregs +
+                                sphy->drv_data->devphy_reg_offset;
+                        en_mask = sphy->drv_data->devphy_en_mask;
+                } else if (sphy->phy_type == USB_PHY_TYPE_HOST) {
+                        reg = sphy->pmuregs +
+                                sphy->drv_data->hostphy_reg_offset;
+                        en_mask = sphy->drv_data->hostphy_en_mask;
+                }
+                break;
+        default:
+                dev_err(sphy->dev, "Invalid SoC type\n");
+                return;
+        }
+
+        reg_val = readl(reg);
+
+        if (on)
+                reg_val &= ~en_mask;
+        else
+                reg_val |= en_mask;
+
+        writel(reg_val, reg);
+}
+
+/*
+ * Configure the mode of working of usb-phy here: HOST/DEVICE.
+ */
+static void samsung_usbphy_cfg_sel(struct samsung_usbphy *sphy)
+{
+        u32 reg;
+
+        if (!sphy->sysreg) {
+                dev_warn(sphy->dev, "Can't configure specified phy mode\n");
+                return;
+        }
+
+        reg = readl(sphy->sysreg);
+
+        if (sphy->phy_type == USB_PHY_TYPE_DEVICE)
+                reg &= ~EXYNOS_USB20PHY_CFG_HOST_LINK;
+        else if (sphy->phy_type == USB_PHY_TYPE_HOST)
+                reg |= EXYNOS_USB20PHY_CFG_HOST_LINK;
+
+        writel(reg, sphy->sysreg);
+}
+
+/*
+ * PHYs are different for USB Device and USB Host.
+ * This make sure that correct PHY type is selected before
+ * any operation on PHY.
+ */
+static int samsung_usbphy_set_type(struct usb_phy *phy,
+                                enum samsung_usb_phy_type phy_type)
+{
+        struct samsung_usbphy *sphy = phy_to_sphy(phy);
+
+        sphy->phy_type = phy_type;
+
+        return 0;
+}
+
+/*
+ * Returns reference clock frequency selection value
+ */
+static int samsung_usbphy_get_refclk_freq(struct samsung_usbphy *sphy)
+{
+        struct clk *ref_clk;
+        int refclk_freq = 0;
+
+        /*
+         * In exynos5250 USB host and device PHY use
+         * external crystal clock XXTI
+         */
+        if (sphy->drv_data->cpu_type == TYPE_EXYNOS5250)
+                ref_clk = clk_get(sphy->dev, "ext_xtal");
+        else
+                ref_clk = clk_get(sphy->dev, "xusbxti");
+        if (IS_ERR(ref_clk)) {
+                dev_err(sphy->dev, "Failed to get reference clock\n");
+                return PTR_ERR(ref_clk);
+        }
+
+        if (sphy->drv_data->cpu_type == TYPE_EXYNOS5250) {
+                /* set clock frequency for PLL */
+                switch (clk_get_rate(ref_clk)) {
+                case 9600 * KHZ:
+                        refclk_freq = FSEL_CLKSEL_9600K;
+                        break;
+                case 10 * MHZ:
+                        refclk_freq = FSEL_CLKSEL_10M;
+                        break;
+                case 12 * MHZ:
+                        refclk_freq = FSEL_CLKSEL_12M;
+                        break;
+                case 19200 * KHZ:
+                        refclk_freq = FSEL_CLKSEL_19200K;
+                        break;
+                case 20 * MHZ:
+                        refclk_freq = FSEL_CLKSEL_20M;
+                        break;
+                case 50 * MHZ:
+                        refclk_freq = FSEL_CLKSEL_50M;
+                        break;
+                case 24 * MHZ:
+                default:
+                        /* default reference clock */
+                        refclk_freq = FSEL_CLKSEL_24M;
+                        break;
+                }
+        } else {
+                switch (clk_get_rate(ref_clk)) {
+                case 12 * MHZ:
+                        refclk_freq = PHYCLK_CLKSEL_12M;
+                        break;
+                case 24 * MHZ:
+                        refclk_freq = PHYCLK_CLKSEL_24M;
+                        break;
+                case 48 * MHZ:
+                        refclk_freq = PHYCLK_CLKSEL_48M;
+                        break;
+                default:
+                        if (sphy->drv_data->cpu_type == TYPE_S3C64XX)
+                                refclk_freq = PHYCLK_CLKSEL_48M;
+                        else
+                                refclk_freq = PHYCLK_CLKSEL_24M;
+                        break;
+                }
+        }
+        clk_put(ref_clk);
+
+        return refclk_freq;
+}
+
+static bool exynos5_phyhost_is_on(void *regs)
+{
+        u32 reg;
+
+        reg = readl(regs + EXYNOS5_PHY_HOST_CTRL0);
+
+        return !(reg & HOST_CTRL0_SIDDQ);
+}
+
+static void samsung_exynos5_usbphy_enable(struct samsung_usbphy *sphy)
+{
+        void __iomem *regs = sphy->regs;
+        u32 phyclk = sphy->ref_clk_freq;
+        u32 phyhost;
+        u32 phyotg;
+        u32 phyhsic;
+        u32 ehcictrl;
+        u32 ohcictrl;
+
+        /*
+         * phy_usage helps in keeping usage count for phy
+         * so that the first consumer enabling the phy is also
+         * the last consumer to disable it.
+         */
+
+        atomic_inc(&sphy->phy_usage);
+
+        if (exynos5_phyhost_is_on(regs)) {
+                dev_info(sphy->dev, "Already power on PHY\n");
+                return;
+        }
+
+        /* Host configuration */
+        phyhost = readl(regs + EXYNOS5_PHY_HOST_CTRL0);
+
+        /* phy reference clock configuration */
+        phyhost &= ~HOST_CTRL0_FSEL_MASK;
+        phyhost |= HOST_CTRL0_FSEL(phyclk);
+
+        /* host phy reset */
+        phyhost &= ~(HOST_CTRL0_PHYSWRST |
+                        HOST_CTRL0_PHYSWRSTALL |
+                        HOST_CTRL0_SIDDQ |
+                        /* Enable normal mode of operation */
+                        HOST_CTRL0_FORCESUSPEND |
+                        HOST_CTRL0_FORCESLEEP);
+
+        /* Link reset */
+        phyhost |= (HOST_CTRL0_LINKSWRST |
+                        HOST_CTRL0_UTMISWRST |
+                        /* COMMON Block configuration during suspend */
+                        HOST_CTRL0_COMMONON_N);
+        writel(phyhost, regs + EXYNOS5_PHY_HOST_CTRL0);
+        udelay(10);
+        phyhost &= ~(HOST_CTRL0_LINKSWRST |
+                        HOST_CTRL0_UTMISWRST);
+        writel(phyhost, regs + EXYNOS5_PHY_HOST_CTRL0);
+
+        /* OTG configuration */
+        phyotg = readl(regs + EXYNOS5_PHY_OTG_SYS);
+
+        /* phy reference clock configuration */
+        phyotg &= ~OTG_SYS_FSEL_MASK;
+        phyotg |= OTG_SYS_FSEL(phyclk);
+
+        /* Enable normal mode of operation */
+        phyotg &= ~(OTG_SYS_FORCESUSPEND |
+                        OTG_SYS_SIDDQ_UOTG |
+                        OTG_SYS_FORCESLEEP |
+                        OTG_SYS_REFCLKSEL_MASK |
+                        /* COMMON Block configuration during suspend */
+                        OTG_SYS_COMMON_ON);
+
+        /* OTG phy & link reset */
+        phyotg |= (OTG_SYS_PHY0_SWRST |
+                        OTG_SYS_LINKSWRST_UOTG |
+                        OTG_SYS_PHYLINK_SWRESET |
+                        OTG_SYS_OTGDISABLE |
+                        /* Set phy refclk */
+                        OTG_SYS_REFCLKSEL_CLKCORE);
+
+        writel(phyotg, regs + EXYNOS5_PHY_OTG_SYS);
+        udelay(10);
+        phyotg &= ~(OTG_SYS_PHY0_SWRST |
+                        OTG_SYS_LINKSWRST_UOTG |
+                        OTG_SYS_PHYLINK_SWRESET);
+        writel(phyotg, regs + EXYNOS5_PHY_OTG_SYS);
+
+        /* HSIC phy configuration */
+        phyhsic = (HSIC_CTRL_REFCLKDIV_12 |
+                        HSIC_CTRL_REFCLKSEL |
+                        HSIC_CTRL_PHYSWRST);
+        writel(phyhsic, regs + EXYNOS5_PHY_HSIC_CTRL1);
+        writel(phyhsic, regs + EXYNOS5_PHY_HSIC_CTRL2);
+        udelay(10);
+        phyhsic &= ~HSIC_CTRL_PHYSWRST;
+        writel(phyhsic, regs + EXYNOS5_PHY_HSIC_CTRL1);
+        writel(phyhsic, regs + EXYNOS5_PHY_HSIC_CTRL2);
+
+        udelay(80);
+
+        /* enable EHCI DMA burst */
+        ehcictrl = readl(regs + EXYNOS5_PHY_HOST_EHCICTRL);
+        ehcictrl |= (HOST_EHCICTRL_ENAINCRXALIGN |
+                                HOST_EHCICTRL_ENAINCR4 |
+                                HOST_EHCICTRL_ENAINCR8 |
+                                HOST_EHCICTRL_ENAINCR16);
+        writel(ehcictrl, regs + EXYNOS5_PHY_HOST_EHCICTRL);
+
+        /* set ohci_suspend_on_n */
+        ohcictrl = readl(regs + EXYNOS5_PHY_HOST_OHCICTRL);
+        ohcictrl |= HOST_OHCICTRL_SUSPLGCY;
+        writel(ohcictrl, regs + EXYNOS5_PHY_HOST_OHCICTRL);
+}
+
+static void samsung_usbphy_enable(struct samsung_usbphy *sphy)
+{
+        void __iomem *regs = sphy->regs;
+        u32 phypwr;
+        u32 phyclk;
+        u32 rstcon;
+
+        /* set clock frequency for PLL */
+        phyclk = sphy->ref_clk_freq;
+        phypwr = readl(regs + SAMSUNG_PHYPWR);
+        rstcon = readl(regs + SAMSUNG_RSTCON);
+
+        switch (sphy->drv_data->cpu_type) {
+        case TYPE_S3C64XX:
+                phyclk &= ~PHYCLK_COMMON_ON_N;
+                phypwr &= ~PHYPWR_NORMAL_MASK;
+                rstcon |= RSTCON_SWRST;
+                break;
+        case TYPE_EXYNOS4210:
+                phypwr &= ~PHYPWR_NORMAL_MASK_PHY0;
+                rstcon |= RSTCON_SWRST;
+        default:
+                break;
+        }
+
+        writel(phyclk, regs + SAMSUNG_PHYCLK);
+        /* Configure PHY0 for normal operation*/
+        writel(phypwr, regs + SAMSUNG_PHYPWR);
+        /* reset all ports of PHY and Link */
+        writel(rstcon, regs + SAMSUNG_RSTCON);
+        udelay(10);
+        rstcon &= ~RSTCON_SWRST;
+        writel(rstcon, regs + SAMSUNG_RSTCON);
+}
+
+static void samsung_exynos5_usbphy_disable(struct samsung_usbphy *sphy)
+{
+        void __iomem *regs = sphy->regs;
+        u32 phyhost;
+        u32 phyotg;
+        u32 phyhsic;
+
+        if (atomic_dec_return(&sphy->phy_usage) > 0) {
+                dev_info(sphy->dev, "still being used\n");
+                return;
+        }
+
+        phyhsic = (HSIC_CTRL_REFCLKDIV_12 |
+                        HSIC_CTRL_REFCLKSEL |
+                        HSIC_CTRL_SIDDQ |
+                        HSIC_CTRL_FORCESLEEP |
+                        HSIC_CTRL_FORCESUSPEND);
+        writel(phyhsic, regs + EXYNOS5_PHY_HSIC_CTRL1);
+        writel(phyhsic, regs + EXYNOS5_PHY_HSIC_CTRL2);
+
+        phyhost = readl(regs + EXYNOS5_PHY_HOST_CTRL0);
+        phyhost |= (HOST_CTRL0_SIDDQ |
+                        HOST_CTRL0_FORCESUSPEND |
+                        HOST_CTRL0_FORCESLEEP |
+                        HOST_CTRL0_PHYSWRST |
+                        HOST_CTRL0_PHYSWRSTALL);
+        writel(phyhost, regs + EXYNOS5_PHY_HOST_CTRL0);
+
+        phyotg = readl(regs + EXYNOS5_PHY_OTG_SYS);
+        phyotg |= (OTG_SYS_FORCESUSPEND |
+                        OTG_SYS_SIDDQ_UOTG |
+                        OTG_SYS_FORCESLEEP);
+        writel(phyotg, regs + EXYNOS5_PHY_OTG_SYS);
+}
+
+static void samsung_usbphy_disable(struct samsung_usbphy *sphy)
+{
+        void __iomem *regs = sphy->regs;
+        u32 phypwr;
+
+        phypwr = readl(regs + SAMSUNG_PHYPWR);
+
+        switch (sphy->drv_data->cpu_type) {
+        case TYPE_S3C64XX:
+                phypwr |= PHYPWR_NORMAL_MASK;
+                break;
+        case TYPE_EXYNOS4210:
+                phypwr |= PHYPWR_NORMAL_MASK_PHY0;
+        default:
+                break;
+        }
+
+        /* Disable analog and otg block power */
+        writel(phypwr, regs + SAMSUNG_PHYPWR);
+}
+
+/*
+ * The function passed to the usb driver for phy initialization
+ */
+static int samsung_usbphy_init(struct usb_phy *phy)
+{
+        struct samsung_usbphy *sphy;
+        struct usb_bus *host = NULL;
+        unsigned long flags;
+        int ret = 0;
+
+        sphy = phy_to_sphy(phy);
+
+        host = phy->otg->host;
+
+        /* Enable the phy clock */
+        ret = clk_prepare_enable(sphy->clk);
+        if (ret) {
+                dev_err(sphy->dev, "%s: clk_prepare_enable failed\n", __func__);
+                return ret;
+        }
+
+        spin_lock_irqsave(&sphy->lock, flags);
+
+        if (host) {
+                /* setting default phy-type for USB 2.0 */
+                if (!strstr(dev_name(host->controller), "ehci") ||
+                                !strstr(dev_name(host->controller), "ohci"))
+                        samsung_usbphy_set_type(&sphy->phy, USB_PHY_TYPE_HOST);
+        } else {
+                samsung_usbphy_set_type(&sphy->phy, USB_PHY_TYPE_DEVICE);
+        }
+
+        /* Disable phy isolation */
+        if (sphy->plat && sphy->plat->pmu_isolation)
+                sphy->plat->pmu_isolation(false);
+        else
+                samsung_usbphy_set_isolation(sphy, false);
+
+        /* Selecting Host/OTG mode; After reset USB2.0PHY_CFG: HOST */
+        samsung_usbphy_cfg_sel(sphy);
+
+        /* Initialize usb phy registers */
+        if (sphy->drv_data->cpu_type == TYPE_EXYNOS5250)
+                samsung_exynos5_usbphy_enable(sphy);
+        else
+                samsung_usbphy_enable(sphy);
+
+        spin_unlock_irqrestore(&sphy->lock, flags);
+
+        /* Disable the phy clock */
+        clk_disable_unprepare(sphy->clk);
+
+        return ret;
+}
+
+/*
+ * The function passed to the usb driver for phy shutdown
+ */
+static void samsung_usbphy_shutdown(struct usb_phy *phy)
+{
+        struct samsung_usbphy *sphy;
+        struct usb_bus *host = NULL;
+        unsigned long flags;
+
+        sphy = phy_to_sphy(phy);
+
+        host = phy->otg->host;
+
+        if (clk_prepare_enable(sphy->clk)) {
+                dev_err(sphy->dev, "%s: clk_prepare_enable failed\n", __func__);
+                return;
+        }
+
+        spin_lock_irqsave(&sphy->lock, flags);
+
+        if (host) {
+                /* setting default phy-type for USB 2.0 */
+                if (!strstr(dev_name(host->controller), "ehci") ||
+                                !strstr(dev_name(host->controller), "ohci"))
+                        samsung_usbphy_set_type(&sphy->phy, USB_PHY_TYPE_HOST);
+        } else {
+                samsung_usbphy_set_type(&sphy->phy, USB_PHY_TYPE_DEVICE);
+        }
+
+        /* De-initialize usb phy registers */
+        if (sphy->drv_data->cpu_type == TYPE_EXYNOS5250)
+                samsung_exynos5_usbphy_disable(sphy);
+        else
+                samsung_usbphy_disable(sphy);
+
+        /* Enable phy isolation */
+        if (sphy->plat && sphy->plat->pmu_isolation)
+                sphy->plat->pmu_isolation(true);
+        else
+                samsung_usbphy_set_isolation(sphy, true);
+
+        spin_unlock_irqrestore(&sphy->lock, flags);
+
+        clk_disable_unprepare(sphy->clk);
+}
+
+static const struct of_device_id samsung_usbphy_dt_match[];
+
+static inline const struct samsung_usbphy_drvdata
+*samsung_usbphy_get_driver_data(struct platform_device *pdev)
+{
+        if (pdev->dev.of_node) {
+                const struct of_device_id *match;
+                match = of_match_node(samsung_usbphy_dt_match,
+                                                        pdev->dev.of_node);
+                return match->data;
+        }
+
+        return (struct samsung_usbphy_drvdata *)
+                                platform_get_device_id(pdev)->driver_data;
+}
+
+static int samsung_usbphy_probe(struct platform_device *pdev)
+{
+        struct samsung_usbphy *sphy;
+        struct usb_otg *otg;
+        struct samsung_usbphy_data *pdata = pdev->dev.platform_data;
+        const struct samsung_usbphy_drvdata *drv_data;
+        struct device *dev = &pdev->dev;
+        struct resource *phy_mem;
+        void __iomem    *phy_base;
+        struct clk *clk;
+        int ret;
+
+        phy_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!phy_mem) {
+                dev_err(dev, "%s: missing mem resource\n", __func__);
+                return -ENODEV;
+        }
+
+        phy_base = devm_request_and_ioremap(dev, phy_mem);
+        if (!phy_base) {
+                dev_err(dev, "%s: register mapping failed\n", __func__);
+                return -ENXIO;
+        }
+
+        sphy = devm_kzalloc(dev, sizeof(*sphy), GFP_KERNEL);
+        if (!sphy)
+                return -ENOMEM;
+
+        otg = devm_kzalloc(dev, sizeof(*otg), GFP_KERNEL);
+        if (!otg)
+                return -ENOMEM;
+
+        drv_data = samsung_usbphy_get_driver_data(pdev);
+
+        if (drv_data->cpu_type == TYPE_EXYNOS5250)
+                clk = devm_clk_get(dev, "usbhost");
+        else
+                clk = devm_clk_get(dev, "otg");
+
+        if (IS_ERR(clk)) {
+                dev_err(dev, "Failed to get otg clock\n");
+                return PTR_ERR(clk);
+        }
+
+        sphy->dev = dev;
+
+        if (dev->of_node) {
+                ret = samsung_usbphy_parse_dt(sphy);
+                if (ret < 0)
+                        return ret;
+        } else {
+                if (!pdata) {
+                        dev_err(dev, "no platform data specified\n");
+                        return -EINVAL;
+                }
+        }
+
+        sphy->plat              = pdata;
+        sphy->regs              = phy_base;
+        sphy->clk               = clk;
+        sphy->drv_data          = drv_data;
+        sphy->phy.dev           = sphy->dev;
+        sphy->phy.label         = "samsung-usbphy";
+        sphy->phy.init          = samsung_usbphy_init;
+        sphy->phy.shutdown      = samsung_usbphy_shutdown;
+        sphy->ref_clk_freq      = samsung_usbphy_get_refclk_freq(sphy);
+
+        sphy->phy.otg           = otg;
+        sphy->phy.otg->phy      = &sphy->phy;
+        sphy->phy.otg->set_host = samsung_usbphy_set_host;
+
+        spin_lock_init(&sphy->lock);
+
+        platform_set_drvdata(pdev, sphy);
+
+        return usb_add_phy(&sphy->phy, USB_PHY_TYPE_USB2);
+}
+
+static int samsung_usbphy_remove(struct platform_device *pdev)
+{
+        struct samsung_usbphy *sphy = platform_get_drvdata(pdev);
+
+        usb_remove_phy(&sphy->phy);
+
+        if (sphy->pmuregs)
+                iounmap(sphy->pmuregs);
+        if (sphy->sysreg)
+                iounmap(sphy->sysreg);
+
+        return 0;
+}
+
+static const struct samsung_usbphy_drvdata usbphy_s3c64xx = {
+        .cpu_type               = TYPE_S3C64XX,
+        .devphy_en_mask         = S3C64XX_USBPHY_ENABLE,
+};
+
+static const struct samsung_usbphy_drvdata usbphy_exynos4 = {
+        .cpu_type               = TYPE_EXYNOS4210,
+        .devphy_en_mask         = EXYNOS_USBPHY_ENABLE,
+        .hostphy_en_mask        = EXYNOS_USBPHY_ENABLE,
+};
+
+static struct samsung_usbphy_drvdata usbphy_exynos5 = {
+        .cpu_type               = TYPE_EXYNOS5250,
+        .hostphy_en_mask        = EXYNOS_USBPHY_ENABLE,
+        .hostphy_reg_offset     = EXYNOS_USBHOST_PHY_CTRL_OFFSET,
+};
+
+#ifdef CONFIG_OF
+static const struct of_device_id samsung_usbphy_dt_match[] = {
+        {
+                .compatible = "samsung,s3c64xx-usbphy",
+                .data = &usbphy_s3c64xx,
+        }, {
+                .compatible = "samsung,exynos4210-usbphy",
+                .data = &usbphy_exynos4,
+        }, {
+                .compatible = "samsung,exynos5250-usbphy",
+                .data = &usbphy_exynos5
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, samsung_usbphy_dt_match);
+#endif
+
+static struct platform_device_id samsung_usbphy_driver_ids[] = {
+        {
+                .name           = "s3c64xx-usbphy",
+                .driver_data    = (unsigned long)&usbphy_s3c64xx,
+        }, {
+                .name           = "exynos4210-usbphy",
+                .driver_data    = (unsigned long)&usbphy_exynos4,
+        }, {
+                .name           = "exynos5250-usbphy",
+                .driver_data    = (unsigned long)&usbphy_exynos5,
+        },
+        {},
+};
+
+MODULE_DEVICE_TABLE(platform, samsung_usbphy_driver_ids);
+
+static struct platform_driver samsung_usbphy_driver = {
+        .probe          = samsung_usbphy_probe,
+        .remove         = samsung_usbphy_remove,
+        .id_table       = samsung_usbphy_driver_ids,
+        .driver         = {
+                .name   = "samsung-usbphy",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(samsung_usbphy_dt_match),
+        },
+};
+
+module_platform_driver(samsung_usbphy_driver);
+
+MODULE_DESCRIPTION("Samsung USB phy controller");
+MODULE_AUTHOR("Praveen Paneri <p.paneri@samsung.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:samsung-usbphy");
diff --git a/drivers/usb/renesas_usbhs/Kconfig b/drivers/usb/renesas_usbhs/Kconfig
index 6f4afa436381..29feb00d7f39 100644
--- a/drivers/usb/renesas_usbhs/Kconfig
+++ b/drivers/usb/renesas_usbhs/Kconfig
@@ -4,7 +4,7 @@
 
 config USB_RENESAS_USBHS
         tristate 'Renesas USBHS controller'
-        depends on USB && USB_GADGET
+        depends on USB && USB_GADGET && GENERIC_HARDIRQS
         default n
         help
           Renesas USBHS is a discrete USB host and peripheral controller chip
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index f2985cd88021..78fca978b2d0 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -900,7 +900,7 @@ static int usbhsg_set_selfpowered(struct usb_gadget *gadget, int is_self)
         return 0;
 }
 
-static struct usb_gadget_ops usbhsg_gadget_ops = {
+static const struct usb_gadget_ops usbhsg_gadget_ops = {
         .get_frame              = usbhsg_get_frame,
         .set_selfpowered        = usbhsg_set_selfpowered,
         .udc_start              = usbhsg_gadget_start,
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 76f462241738..dad8363e5b2a 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -647,6 +647,18 @@ config USB_SERIAL_VIVOPAY_SERIAL
           To compile this driver as a module, choose M here: the
           module will be called vivopay-serial.
 
+config USB_SERIAL_XSENS_MT
+        tristate "Xsens motion tracker serial interface driver"
+        help
+          Say Y here if you want to use Xsens motion trackers.
+
+          This driver supports the new generation of motion trackers
+          by Xsens. Older devices can be accessed using the FTDI_SIO
+          driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called xsens_mt.
+
 config USB_SERIAL_ZIO
         tristate "ZIO Motherboard USB serial interface driver"
         help
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 3b3e7308d476..eaf5ca14dfeb 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -61,5 +61,6 @@ obj-$(CONFIG_USB_SERIAL_VISOR)			+= visor.o
 obj-$(CONFIG_USB_SERIAL_WHITEHEAT)              += whiteheat.o
 obj-$(CONFIG_USB_SERIAL_XIRCOM)                 += keyspan_pda.o
 obj-$(CONFIG_USB_SERIAL_VIVOPAY_SERIAL)         += vivopay-serial.o
+obj-$(CONFIG_USB_SERIAL_XSENS_MT)               += xsens_mt.o
 obj-$(CONFIG_USB_SERIAL_ZIO)                    += zio.o
 obj-$(CONFIG_USB_SERIAL_ZTE)                    += zte_ev.o
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 90ceef1776c3..d07fccf3bab5 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1886,24 +1886,22 @@ static void ftdi_dtr_rts(struct usb_serial_port *port, int on)
 {
         struct ftdi_private *priv = usb_get_serial_port_data(port);
 
-        mutex_lock(&port->serial->disc_mutex);
-        if (!port->serial->disconnected) {
-                /* Disable flow control */
-                if (!on && usb_control_msg(port->serial->dev,
+        /* Disable flow control */
+        if (!on) {
+                if (usb_control_msg(port->serial->dev,
                             usb_sndctrlpipe(port->serial->dev, 0),
                             FTDI_SIO_SET_FLOW_CTRL_REQUEST,
                             FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
                             0, priv->interface, NULL, 0,
                             WDR_TIMEOUT) < 0) {
-                            dev_err(&port->dev, "error from flowcontrol urb\n");
+                        dev_err(&port->dev, "error from flowcontrol urb\n");
                 }
-                /* drop RTS and DTR */
-                if (on)
-                        set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
-                else
-                        clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
         }
-        mutex_unlock(&port->serial->disc_mutex);
+        /* drop RTS and DTR */
+        if (on)
+                set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+        else
+                clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
 }
 
 /*
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 82afc4d6a327..641ab3da2d83 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -521,65 +521,6 @@ exit_is_tx_active:
         return bytes_left;
 }
 
-static void chase_port(struct edgeport_port *port, unsigned long timeout,
-                                                                int flush)
-{
-        int baud_rate;
-        struct tty_struct *tty = tty_port_tty_get(&port->port->port);
-        struct usb_serial *serial = port->port->serial;
-        wait_queue_t wait;
-        unsigned long flags;
-
-        if (!tty)
-                return;
-
-        if (!timeout)
-                timeout = (HZ * EDGE_CLOSING_WAIT)/100;
-
-        /* wait for data to drain from the buffer */
-        spin_lock_irqsave(&port->ep_lock, flags);
-        init_waitqueue_entry(&wait, current);
-        add_wait_queue(&tty->write_wait, &wait);
-        for (;;) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (kfifo_len(&port->write_fifo) == 0
-                || timeout == 0 || signal_pending(current)
-                || serial->disconnected)
-                        /* disconnect */
-                        break;
-                spin_unlock_irqrestore(&port->ep_lock, flags);
-                timeout = schedule_timeout(timeout);
-                spin_lock_irqsave(&port->ep_lock, flags);
-        }
-        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&tty->write_wait, &wait);
-        if (flush)
-                kfifo_reset_out(&port->write_fifo);
-        spin_unlock_irqrestore(&port->ep_lock, flags);
-        tty_kref_put(tty);
-
-        /* wait for data to drain from the device */
-        timeout += jiffies;
-        while ((long)(jiffies - timeout) < 0 && !signal_pending(current)
-                                                && !serial->disconnected) {
-                /* not disconnected */
-                if (!tx_active(port))
-                        break;
-                msleep(10);
-        }
-
-        /* disconnected */
-        if (serial->disconnected)
-                return;
-
-        /* wait one more character time, based on baud rate */
-        /* (tx_active doesn't seem to wait for the last byte) */
-        baud_rate = port->baud_rate;
-        if (baud_rate == 0)
-                baud_rate = 50;
-        msleep(max(1, DIV_ROUND_UP(10000, baud_rate)));
-}
-
 static int choose_config(struct usb_device *dev)
 {
         /*
@@ -1944,6 +1885,8 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
 
         ++edge_serial->num_ports_open;
 
+        port->port.drain_delay = 1;
+
         goto release_es_lock;
 
 unlink_int_urb:
@@ -1959,6 +1902,7 @@ static void edge_close(struct usb_serial_port *port)
         struct edgeport_serial *edge_serial;
         struct edgeport_port *edge_port;
         struct usb_serial *serial = port->serial;
+        unsigned long flags;
         int port_number;
 
         edge_serial = usb_get_serial_data(port->serial);
@@ -1970,12 +1914,12 @@ static void edge_close(struct usb_serial_port *port)
          * this flag and dump add read data */
         edge_port->close_pending = 1;
 
-        /* chase the port close and flush */
-        chase_port(edge_port, (HZ * closing_wait) / 100, 1);
-
         usb_kill_urb(port->read_urb);
         usb_kill_urb(port->write_urb);
         edge_port->ep_write_urb_in_use = 0;
+        spin_lock_irqsave(&edge_port->ep_lock, flags);
+        kfifo_reset_out(&edge_port->write_fifo);
+        spin_unlock_irqrestore(&edge_port->ep_lock, flags);
 
         /* assuming we can still talk to the device,
          * send a close port command to it */
@@ -2101,16 +2045,21 @@ static int edge_chars_in_buffer(struct tty_struct *tty)
         struct edgeport_port *edge_port = usb_get_serial_port_data(port);
         int chars = 0;
         unsigned long flags;
+        int ret;
 
         if (edge_port == NULL)
                 return 0;
-        if (edge_port->close_pending == 1)
-                return 0;
 
         spin_lock_irqsave(&edge_port->ep_lock, flags);
         chars = kfifo_len(&edge_port->write_fifo);
         spin_unlock_irqrestore(&edge_port->ep_lock, flags);
 
+        if (!chars) {
+                ret = tx_active(edge_port);
+                if (ret > 0)
+                        chars = ret;
+        }
+
         dev_dbg(&port->dev, "%s - returns %d\n", __func__, chars);
         return chars;
 }
@@ -2448,10 +2397,15 @@ static int get_serial_info(struct edgeport_port *edge_port,
                                 struct serial_struct __user *retinfo)
 {
         struct serial_struct tmp;
+        unsigned cwait;
 
         if (!retinfo)
                 return -EFAULT;
 
+        cwait = edge_port->port->port.closing_wait;
+        if (cwait != ASYNC_CLOSING_WAIT_NONE)
+                cwait = jiffies_to_msecs(closing_wait) / 10;
+
         memset(&tmp, 0, sizeof(tmp));
 
         tmp.type                = PORT_16550A;
@@ -2462,7 +2416,7 @@ static int get_serial_info(struct edgeport_port *edge_port,
         tmp.xmit_fifo_size      = edge_port->port->bulk_out_size;
         tmp.baud_base           = 9600;
         tmp.close_delay         = 5*HZ;
-        tmp.closing_wait        = closing_wait;
+        tmp.closing_wait        = cwait;
 
         if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
                 return -EFAULT;
@@ -2517,8 +2471,7 @@ static void edge_break(struct tty_struct *tty, int break_state)
         int status;
         int bv = 0;     /* Off */
 
-        /* chase the port close */
-        chase_port(edge_port, 0, 0);
+        tty_wait_until_sent(tty, 0);
 
         if (break_state == -1)
                 bv = 1; /* On */
@@ -2591,6 +2544,8 @@ static int edge_port_probe(struct usb_serial_port *port)
                 return ret;
         }
 
+        port->port.closing_wait = msecs_to_jiffies(closing_wait * 10);
+
         return 0;
 }
 
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 97bc49f68efd..3d95637f3d68 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -298,7 +298,7 @@ static void	usa26_indat_callback(struct urb *urb)
         endpoint = usb_pipeendpoint(urb->pipe);
 
         if (status) {
-                dev_dbg(&urb->dev->dev,"%s - nonzero status: %x on endpoint %d.\n",
+                dev_dbg(&urb->dev->dev, "%s - nonzero status: %x on endpoint %d.\n",
                         __func__, status, endpoint);
                 return;
         }
@@ -532,7 +532,7 @@ static void	usa28_instat_callback(struct urb *urb)
 
         /*
         dev_dbg(&urb->dev->dev,
-                "%s %x %x %x %x %x %x %x %x %x %x %x %x", __func__,
+                "%s %x %x %x %x %x %x %x %x %x %x %x %x", __func__,
                 data[0], data[1], data[2], data[3], data[4], data[5],
                 data[6], data[7], data[8], data[9], data[10], data[11]);
         */
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index b6911757c855..d9c86516fed4 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -499,19 +499,15 @@ static void mct_u232_dtr_rts(struct usb_serial_port *port, int on)
         unsigned int control_state;
         struct mct_u232_private *priv = usb_get_serial_port_data(port);
 
-        mutex_lock(&port->serial->disc_mutex);
-        if (!port->serial->disconnected) {
-                /* drop DTR and RTS */
-                spin_lock_irq(&priv->lock);
-                if (on)
-                        priv->control_state |= TIOCM_DTR | TIOCM_RTS;
-                else
-                        priv->control_state &= ~(TIOCM_DTR | TIOCM_RTS);
-                control_state = priv->control_state;
-                spin_unlock_irq(&priv->lock);
-                mct_u232_set_modem_ctrl(port, control_state);
-        }
-        mutex_unlock(&port->serial->disc_mutex);
+        spin_lock_irq(&priv->lock);
+        if (on)
+                priv->control_state |= TIOCM_DTR | TIOCM_RTS;
+        else
+                priv->control_state &= ~(TIOCM_DTR | TIOCM_RTS);
+        control_state = priv->control_state;
+        spin_unlock_irq(&priv->lock);
+
+        mct_u232_set_modem_ctrl(port, control_state);
 }
 
 static void mct_u232_close(struct usb_serial_port *port)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 567bc77d6397..f7d339d8187b 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -479,6 +479,7 @@ static const struct option_blacklist_info four_g_w14_blacklist = {
 
 static const struct option_blacklist_info alcatel_x200_blacklist = {
         .sendsetup = BIT(0) | BIT(1),
+        .reserved = BIT(4),
 };
 
 static const struct option_blacklist_info zte_0037_blacklist = {
@@ -575,8 +576,14 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
         { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
         { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
+        { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
+                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t) &net_intf1_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
@@ -1215,7 +1222,14 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
           .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
         },
-        { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) },
+        { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),
+          .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+        { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052),
+          .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+        { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6),
+          .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+        { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7),
+          .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
         { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V),
           .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index d152be97d041..a8d5110d4cc5 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -945,19 +945,17 @@ static void qt2_dtr_rts(struct usb_serial_port *port, int on)
         struct usb_device *dev = port->serial->dev;
         struct qt2_port_private *port_priv = usb_get_serial_port_data(port);
 
-        mutex_lock(&port->serial->disc_mutex);
-        if (!port->serial->disconnected) {
-                /* Disable flow control */
-                if (!on && qt2_setregister(dev, port_priv->device_port,
+        /* Disable flow control */
+        if (!on) {
+                if (qt2_setregister(dev, port_priv->device_port,
                                            UART_MCR, 0) < 0)
                         dev_warn(&port->dev, "error from flowcontrol urb\n");
-                /* drop RTS and DTR */
-                if (on)
-                        update_mctrl(port_priv, TIOCM_DTR | TIOCM_RTS, 0);
-                else
-                        update_mctrl(port_priv, 0, TIOCM_DTR | TIOCM_RTS);
         }
-        mutex_unlock(&port->serial->disc_mutex);
+        /* drop RTS and DTR */
+        if (on)
+                update_mctrl(port_priv, TIOCM_DTR | TIOCM_RTS, 0);
+        else
+                update_mctrl(port_priv, 0, TIOCM_DTR | TIOCM_RTS);
 }
 
 static void qt2_update_msr(struct usb_serial_port *port, unsigned char *ch)
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index af06f2f5f38b..d4426c038c32 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -861,19 +861,13 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
 
 static void sierra_dtr_rts(struct usb_serial_port *port, int on)
 {
-        struct usb_serial *serial = port->serial;
         struct sierra_port_private *portdata;
 
         portdata = usb_get_serial_port_data(port);
         portdata->rts_state = on;
         portdata->dtr_state = on;
 
-        if (serial->dev) {
-                mutex_lock(&serial->disc_mutex);
-                if (!serial->disconnected)
-                        sierra_send_setup(port);
-                mutex_unlock(&serial->disc_mutex);
-        }
+        sierra_send_setup(port);
 }
 
 static int sierra_startup(struct usb_serial *serial)
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index 4543ea350229..d938396171e8 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -506,19 +506,16 @@ static void ssu100_dtr_rts(struct usb_serial_port *port, int on)
 {
         struct usb_device *dev = port->serial->dev;
 
-        mutex_lock(&port->serial->disc_mutex);
-        if (!port->serial->disconnected) {
-                /* Disable flow control */
-                if (!on &&
-                    ssu100_setregister(dev, 0, UART_MCR, 0) < 0)
+        /* Disable flow control */
+        if (!on) {
+                if (ssu100_setregister(dev, 0, UART_MCR, 0) < 0)
                         dev_err(&port->dev, "error from flowcontrol urb\n");
-                /* drop RTS and DTR */
-                if (on)
-                        set_mctrl(dev, TIOCM_DTR | TIOCM_RTS);
-                else
-                        clear_mctrl(dev, TIOCM_DTR | TIOCM_RTS);
         }
-        mutex_unlock(&port->serial->disc_mutex);
+        /* drop RTS and DTR */
+        if (on)
+                set_mctrl(dev, TIOCM_DTR | TIOCM_RTS);
+        else
+                clear_mctrl(dev, TIOCM_DTR | TIOCM_RTS);
 }
 
 static void ssu100_update_msr(struct usb_serial_port *port, u8 msr)
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 64bda135ba7e..a19ed74d770d 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -361,15 +361,21 @@ static int serial_write_room(struct tty_struct *tty)
 static int serial_chars_in_buffer(struct tty_struct *tty)
 {
         struct usb_serial_port *port = tty->driver_data;
+        struct usb_serial *serial = port->serial;
+        int count = 0;
 
         dev_dbg(tty->dev, "%s - port %d\n", __func__, port->number);
 
+        mutex_lock(&serial->disc_mutex);
         /* if the device was unplugged then any remaining characters
            fell out of the connector ;) */
-        if (port->serial->disconnected)
-                return 0;
-        /* pass on to the driver specific version of this function */
-        return port->serial->type->chars_in_buffer(tty);
+        if (serial->disconnected)
+                count = 0;
+        else
+                count = serial->type->chars_in_buffer(tty);
+        mutex_unlock(&serial->disc_mutex);
+
+        return count;
 }
 
 static void serial_throttle(struct tty_struct *tty)
@@ -688,10 +694,20 @@ static int serial_carrier_raised(struct tty_port *port)
 static void serial_dtr_rts(struct tty_port *port, int on)
 {
         struct usb_serial_port *p = container_of(port, struct usb_serial_port, port);
-        struct usb_serial_driver *drv = p->serial->type;
+        struct usb_serial *serial = p->serial;
+        struct usb_serial_driver *drv = serial->type;
 
-        if (drv->dtr_rts)
+        if (!drv->dtr_rts)
+                return;
+        /*
+         * Work-around bug in the tty-layer which can result in dtr_rts
+         * being called after a disconnect (and tty_unregister_device
+         * has returned). Remove once bug has been squashed.
+         */
+        mutex_lock(&serial->disc_mutex);
+        if (!serial->disconnected)
                 drv->dtr_rts(p, on);
+        mutex_unlock(&serial->disc_mutex);
 }
 
 static const struct tty_port_operations serial_port_ops = {
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 01c94aada56c..1355a6cd4508 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -38,7 +38,6 @@
 
 void usb_wwan_dtr_rts(struct usb_serial_port *port, int on)
 {
-        struct usb_serial *serial = port->serial;
         struct usb_wwan_port_private *portdata;
         struct usb_wwan_intf_private *intfdata;
 
@@ -48,12 +47,11 @@ void usb_wwan_dtr_rts(struct usb_serial_port *port, int on)
                 return;
 
         portdata = usb_get_serial_port_data(port);
-        mutex_lock(&serial->disc_mutex);
+        /* FIXME: locking */
         portdata->rts_state = on;
         portdata->dtr_state = on;
-        if (serial->dev)
-                intfdata->send_setup(port);
-        mutex_unlock(&serial->disc_mutex);
+
+        intfdata->send_setup(port);
 }
 EXPORT_SYMBOL(usb_wwan_dtr_rts);
 
diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
new file mode 100644
index 000000000000..1d5798d891bc
--- /dev/null
+++ b/drivers/usb/serial/xsens_mt.c
@@ -0,0 +1,86 @@
+/*
+ * Xsens MT USB driver
+ *
+ * Copyright (C) 2013 Xsens <info@xsens.com>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License version
+ *  2 as published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/tty.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include <linux/usb/serial.h>
+#include <linux/uaccess.h>
+
+#define XSENS_VID 0x2639
+
+#define MTi_10_IMU_PID          0x0001
+#define MTi_20_VRU_PID          0x0002
+#define MTi_30_AHRS_PID         0x0003
+
+#define MTi_100_IMU_PID         0x0011
+#define MTi_200_VRU_PID         0x0012
+#define MTi_300_AHRS_PID        0x0013
+
+#define MTi_G_700_GPS_INS_PID   0x0017
+
+static const struct usb_device_id id_table[] = {
+        { USB_DEVICE(XSENS_VID, MTi_10_IMU_PID) },
+        { USB_DEVICE(XSENS_VID, MTi_20_VRU_PID) },
+        { USB_DEVICE(XSENS_VID, MTi_30_AHRS_PID) },
+
+        { USB_DEVICE(XSENS_VID, MTi_100_IMU_PID) },
+        { USB_DEVICE(XSENS_VID, MTi_200_VRU_PID) },
+        { USB_DEVICE(XSENS_VID, MTi_300_AHRS_PID) },
+
+        { USB_DEVICE(XSENS_VID, MTi_G_700_GPS_INS_PID) },
+        { },
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
+static int has_required_endpoints(const struct usb_host_interface *interface)
+{
+        __u8 i;
+        int has_bulk_in = 0;
+        int has_bulk_out = 0;
+
+        for (i = 0; i < interface->desc.bNumEndpoints; ++i) {
+                if (usb_endpoint_is_bulk_in(&interface->endpoint[i].desc))
+                        has_bulk_in = 1;
+                else if (usb_endpoint_is_bulk_out(&interface->endpoint[i].desc))
+                        has_bulk_out = 1;
+        }
+
+        return has_bulk_in && has_bulk_out;
+}
+
+static int xsens_mt_probe(struct usb_serial *serial,
+                                        const struct usb_device_id *id)
+{
+        if (!has_required_endpoints(serial->interface->cur_altsetting))
+                return -ENODEV;
+        return 0;
+}
+
+static struct usb_serial_driver xsens_mt_device = {
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "xsens_mt",
+        },
+        .id_table = id_table,
+        .num_ports = 1,
+
+        .probe = xsens_mt_probe,
+};
+
+static struct usb_serial_driver * const serial_drivers[] = {
+        &xsens_mt_device, NULL
+};
+
+module_usb_serial_driver(serial_drivers, id_table);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/storage/initializers.c b/drivers/usb/storage/initializers.c
index 16b0bf055eeb..7ab9046ae0ec 100644
--- a/drivers/usb/storage/initializers.c
+++ b/drivers/usb/storage/initializers.c
@@ -147,7 +147,7 @@ static int usb_stor_huawei_dongles_pid(struct us_data *us)
         int idProduct;
 
         idesc = &us->pusb_intf->cur_altsetting->desc;
-        idProduct = us->pusb_dev->descriptor.idProduct;
+        idProduct = le16_to_cpu(us->pusb_dev->descriptor.idProduct);
         /* The first port is CDROM,
          * means the dongle in the single port mode,
          * and a switch command is required to be sent. */
@@ -169,7 +169,7 @@ int usb_stor_huawei_init(struct us_data *us)
         int result = 0;
 
         if (usb_stor_huawei_dongles_pid(us)) {
-                if (us->pusb_dev->descriptor.idProduct >= 0x1446)
+                if (le16_to_cpu(us->pusb_dev->descriptor.idProduct) >= 0x1446)
                         result = usb_stor_huawei_scsi_init(us);
                 else
                         result = usb_stor_huawei_feature_init(us);
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 98b98eef7527..d966b59f7d7b 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -66,6 +66,8 @@ enum {
         DATA_OUT_URB_INFLIGHT   = (1 << 10),
         COMMAND_COMPLETED       = (1 << 11),
         COMMAND_ABORTED         = (1 << 12),
+        UNLINK_DATA_URBS        = (1 << 13),
+        IS_IN_WORK_LIST         = (1 << 14),
 };
 
 /* Overrides scsi_pointer */
@@ -82,11 +84,36 @@ struct uas_cmd_info {
 static int uas_submit_urbs(struct scsi_cmnd *cmnd,
                                 struct uas_dev_info *devinfo, gfp_t gfp);
 static void uas_do_work(struct work_struct *work);
+static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller);
 
 static DECLARE_WORK(uas_work, uas_do_work);
 static DEFINE_SPINLOCK(uas_work_lock);
 static LIST_HEAD(uas_work_list);
 
+static void uas_unlink_data_urbs(struct uas_dev_info *devinfo,
+                                 struct uas_cmd_info *cmdinfo)
+{
+        unsigned long flags;
+
+        /*
+         * The UNLINK_DATA_URBS flag makes sure uas_try_complete
+         * (called by urb completion) doesn't release cmdinfo
+         * underneath us.
+         */
+        spin_lock_irqsave(&devinfo->lock, flags);
+        cmdinfo->state |= UNLINK_DATA_URBS;
+        spin_unlock_irqrestore(&devinfo->lock, flags);
+
+        if (cmdinfo->data_in_urb)
+                usb_unlink_urb(cmdinfo->data_in_urb);
+        if (cmdinfo->data_out_urb)
+                usb_unlink_urb(cmdinfo->data_out_urb);
+
+        spin_lock_irqsave(&devinfo->lock, flags);
+        cmdinfo->state &= ~UNLINK_DATA_URBS;
+        spin_unlock_irqrestore(&devinfo->lock, flags);
+}
+
 static void uas_do_work(struct work_struct *work)
 {
         struct uas_cmd_info *cmdinfo;
@@ -106,6 +133,8 @@ static void uas_do_work(struct work_struct *work)
                 struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata;
                 spin_lock_irqsave(&devinfo->lock, flags);
                 err = uas_submit_urbs(cmnd, cmnd->device->hostdata, GFP_ATOMIC);
+                if (!err)
+                        cmdinfo->state &= ~IS_IN_WORK_LIST;
                 spin_unlock_irqrestore(&devinfo->lock, flags);
                 if (err) {
                         list_del(&cmdinfo->list);
@@ -117,6 +146,45 @@ static void uas_do_work(struct work_struct *work)
         }
 }
 
+static void uas_abort_work(struct uas_dev_info *devinfo)
+{
+        struct uas_cmd_info *cmdinfo;
+        struct uas_cmd_info *temp;
+        struct list_head list;
+        unsigned long flags;
+
+        spin_lock_irq(&uas_work_lock);
+        list_replace_init(&uas_work_list, &list);
+        spin_unlock_irq(&uas_work_lock);
+
+        spin_lock_irqsave(&devinfo->lock, flags);
+        list_for_each_entry_safe(cmdinfo, temp, &list, list) {
+                struct scsi_pointer *scp = (void *)cmdinfo;
+                struct scsi_cmnd *cmnd = container_of(scp,
+                                                        struct scsi_cmnd, SCp);
+                struct uas_dev_info *di = (void *)cmnd->device->hostdata;
+
+                if (di == devinfo) {
+                        cmdinfo->state |= COMMAND_ABORTED;
+                        cmdinfo->state &= ~IS_IN_WORK_LIST;
+                        if (devinfo->resetting) {
+                                /* uas_stat_cmplt() will not do that
+                                 * when a device reset is in
+                                 * progress */
+                                cmdinfo->state &= ~COMMAND_INFLIGHT;
+                        }
+                        uas_try_complete(cmnd, __func__);
+                } else {
+                        /* not our uas device, relink into list */
+                        list_del(&cmdinfo->list);
+                        spin_lock_irq(&uas_work_lock);
+                        list_add_tail(&cmdinfo->list, &uas_work_list);
+                        spin_unlock_irq(&uas_work_lock);
+                }
+        }
+        spin_unlock_irqrestore(&devinfo->lock, flags);
+}
+
 static void uas_sense(struct urb *urb, struct scsi_cmnd *cmnd)
 {
         struct sense_iu *sense_iu = urb->transfer_buffer;
@@ -168,7 +236,7 @@ static void uas_log_cmd_state(struct scsi_cmnd *cmnd, const char *caller)
         struct uas_cmd_info *ci = (void *)&cmnd->SCp;
 
         scmd_printk(KERN_INFO, cmnd, "%s %p tag %d, inflight:"
-                    "%s%s%s%s%s%s%s%s%s%s%s%s\n",
+                    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
                     caller, cmnd, cmnd->request->tag,
                     (ci->state & SUBMIT_STATUS_URB)     ? " s-st"  : "",
                     (ci->state & ALLOC_DATA_IN_URB)     ? " a-in"  : "",
@@ -181,7 +249,9 @@ static void uas_log_cmd_state(struct scsi_cmnd *cmnd, const char *caller)
                     (ci->state & DATA_IN_URB_INFLIGHT)  ? " IN"    : "",
                     (ci->state & DATA_OUT_URB_INFLIGHT) ? " OUT"   : "",
                     (ci->state & COMMAND_COMPLETED)     ? " done"  : "",
-                    (ci->state & COMMAND_ABORTED)       ? " abort" : "");
+                    (ci->state & COMMAND_ABORTED)       ? " abort" : "",
+                    (ci->state & UNLINK_DATA_URBS)      ? " unlink": "",
+                    (ci->state & IS_IN_WORK_LIST)       ? " work"  : "");
 }
 
 static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller)
@@ -192,7 +262,8 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller)
         WARN_ON(!spin_is_locked(&devinfo->lock));
         if (cmdinfo->state & (COMMAND_INFLIGHT |
                               DATA_IN_URB_INFLIGHT |
-                              DATA_OUT_URB_INFLIGHT))
+                              DATA_OUT_URB_INFLIGHT |
+                              UNLINK_DATA_URBS))
                 return -EBUSY;
         BUG_ON(cmdinfo->state & COMMAND_COMPLETED);
         cmdinfo->state |= COMMAND_COMPLETED;
@@ -217,6 +288,7 @@ static void uas_xfer_data(struct urb *urb, struct scsi_cmnd *cmnd,
         if (err) {
                 spin_lock(&uas_work_lock);
                 list_add_tail(&cmdinfo->list, &uas_work_list);
+                cmdinfo->state |= IS_IN_WORK_LIST;
                 spin_unlock(&uas_work_lock);
                 schedule_work(&uas_work);
         }
@@ -274,16 +346,9 @@ static void uas_stat_cmplt(struct urb *urb)
                         uas_sense(urb, cmnd);
                 if (cmnd->result != 0) {
                         /* cancel data transfers on error */
-                        if (cmdinfo->state & DATA_IN_URB_INFLIGHT) {
-                                spin_unlock_irqrestore(&devinfo->lock, flags);
-                                usb_unlink_urb(cmdinfo->data_in_urb);
-                                spin_lock_irqsave(&devinfo->lock, flags);
-                        }
-                        if (cmdinfo->state & DATA_OUT_URB_INFLIGHT) {
-                                spin_unlock_irqrestore(&devinfo->lock, flags);
-                                usb_unlink_urb(cmdinfo->data_out_urb);
-                                spin_lock_irqsave(&devinfo->lock, flags);
-                        }
+                        spin_unlock_irqrestore(&devinfo->lock, flags);
+                        uas_unlink_data_urbs(devinfo, cmdinfo);
+                        spin_lock_irqsave(&devinfo->lock, flags);
                 }
                 cmdinfo->state &= ~COMMAND_INFLIGHT;
                 uas_try_complete(cmnd, __func__);
@@ -579,6 +644,12 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
 
         BUILD_BUG_ON(sizeof(struct uas_cmd_info) > sizeof(struct scsi_pointer));
 
+        if (devinfo->resetting) {
+                cmnd->result = DID_ERROR << 16;
+                cmnd->scsi_done(cmnd);
+                return 0;
+        }
+
         spin_lock_irqsave(&devinfo->lock, flags);
         if (devinfo->cmnd) {
                 spin_unlock_irqrestore(&devinfo->lock, flags);
@@ -623,6 +694,7 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
                 }
                 spin_lock(&uas_work_lock);
                 list_add_tail(&cmdinfo->list, &uas_work_list);
+                cmdinfo->state |= IS_IN_WORK_LIST;
                 spin_unlock(&uas_work_lock);
                 schedule_work(&uas_work);
         }
@@ -689,8 +761,23 @@ static int uas_eh_abort_handler(struct scsi_cmnd *cmnd)
         uas_log_cmd_state(cmnd, __func__);
         spin_lock_irqsave(&devinfo->lock, flags);
         cmdinfo->state |= COMMAND_ABORTED;
-        spin_unlock_irqrestore(&devinfo->lock, flags);
-        ret = uas_eh_task_mgmt(cmnd, "ABORT TASK", TMF_ABORT_TASK);
+        if (cmdinfo->state & IS_IN_WORK_LIST) {
+                spin_lock(&uas_work_lock);
+                list_del(&cmdinfo->list);
+                cmdinfo->state &= ~IS_IN_WORK_LIST;
+                spin_unlock(&uas_work_lock);
+        }
+        if (cmdinfo->state & COMMAND_INFLIGHT) {
+                spin_unlock_irqrestore(&devinfo->lock, flags);
+                ret = uas_eh_task_mgmt(cmnd, "ABORT TASK", TMF_ABORT_TASK);
+        } else {
+                spin_unlock_irqrestore(&devinfo->lock, flags);
+                uas_unlink_data_urbs(devinfo, cmdinfo);
+                spin_lock_irqsave(&devinfo->lock, flags);
+                uas_try_complete(cmnd, __func__);
+                spin_unlock_irqrestore(&devinfo->lock, flags);
+                ret = SUCCESS;
+        }
         return ret;
 }
 
@@ -709,6 +796,7 @@ static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd)
         int err;
 
         devinfo->resetting = 1;
+        uas_abort_work(devinfo);
         usb_kill_anchored_urbs(&devinfo->cmd_urbs);
         usb_kill_anchored_urbs(&devinfo->sense_urbs);
         usb_kill_anchored_urbs(&devinfo->data_urbs);
@@ -903,6 +991,8 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         shost->max_cmd_len = 16 + 252;
         shost->max_id = 1;
+        shost->max_lun = 256;
+        shost->max_channel = 0;
         shost->sg_tablesize = udev->bus->sg_tablesize;
 
         devinfo->intf = intf;
@@ -954,10 +1044,12 @@ static void uas_disconnect(struct usb_interface *intf)
         struct Scsi_Host *shost = usb_get_intfdata(intf);
         struct uas_dev_info *devinfo = (void *)shost->hostdata[0];
 
-        scsi_remove_host(shost);
+        devinfo->resetting = 1;
+        uas_abort_work(devinfo);
         usb_kill_anchored_urbs(&devinfo->cmd_urbs);
         usb_kill_anchored_urbs(&devinfo->sense_urbs);
         usb_kill_anchored_urbs(&devinfo->data_urbs);
+        scsi_remove_host(shost);
         uas_free_streams(devinfo);
         kfree(devinfo);
 }
diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
index 2c8553026222..65a6a75066a8 100644
--- a/drivers/usb/storage/unusual_cypress.h
+++ b/drivers/usb/storage/unusual_cypress.h
@@ -31,7 +31,7 @@ UNUSUAL_DEV(  0x04b4, 0x6831, 0x0000, 0x9999,
                 "Cypress ISD-300LP",
                 USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
 
-UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999,
+UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x0219,
                 "Super Top",
                 "USB 2.0  SATA BRIDGE",
                 USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index cf09b6ba71ff..d6bee407af02 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -988,6 +988,9 @@ int usb_stor_probe2(struct us_data *us)
         if (us->fflags & US_FL_SINGLE_LUN)
                 us->max_lun = 0;
 
+        if (!(us->fflags & US_FL_SCM_MULT_TARG))
+                us_to_host(us)->max_id = 1;
+
         /* Find the endpoints and calculate pipe values */
         result = get_pipes(us);
         if (result)
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 57c01ab09ad8..6ef94bce8c0d 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -695,9 +695,9 @@ error_dto_alloc:
         cnt--;
 error_seg_kzalloc:
         /* use the fact that cnt is left at were it failed */
-        for (; cnt > 0; cnt--) {
-                if (xfer->is_inbound == 0)
-                        kfree(xfer->seg[cnt]->dto_urb);
+        for (; cnt >= 0; cnt--) {
+                if (xfer->seg[cnt] && xfer->is_inbound == 0)
+                        usb_free_urb(xfer->seg[cnt]->dto_urb);
                 kfree(xfer->seg[cnt]);
         }
 error_segs_kzalloc: