16 files changed, 575 insertions, 319 deletions

diff --git a/include/linux/usb/ch11.h b/include/linux/usb/ch11.h
index b6c2863b2c94..7692dc69ccf7 100644
--- a/include/linux/usb/ch11.h
+++ b/include/linux/usb/ch11.h
@@ -236,8 +236,8 @@ struct usb_hub_descriptor {
 
                 struct {
                         __u8 bHubHdrDecLat;
-                        __u16 wHubDelay;
-                        __u16 DeviceRemovable;
+                        __le16 wHubDelay;
+                        __le16 DeviceRemovable;
                 }  __attribute__ ((packed)) ss;
         } u;
 } __attribute__ ((packed));
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 9d8c3b634493..f8dda0621800 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -34,6 +34,8 @@
  * the composite model the host can use both functions at the same time.
  */
 
+#include <linux/bcd.h>
+#include <linux/version.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
@@ -46,6 +48,9 @@
  */
 #define USB_GADGET_DELAYED_STATUS       0x7fff  /* Impossibly large value */
 
+/* big enough to hold our biggest descriptor */
+#define USB_COMP_EP0_BUFSIZ     1024
+
 struct usb_configuration;
 
 /**
@@ -245,24 +250,31 @@ int usb_add_config(struct usb_composite_dev *,
 void usb_remove_config(struct usb_composite_dev *,
                 struct usb_configuration *);
 
+/* predefined index for usb_composite_driver */
+enum {
+        USB_GADGET_MANUFACTURER_IDX     = 0,
+        USB_GADGET_PRODUCT_IDX,
+        USB_GADGET_SERIAL_IDX,
+        USB_GADGET_FIRST_AVAIL_IDX,
+};
+
 /**
  * struct usb_composite_driver - groups configurations into a gadget
  * @name: For diagnostics, identifies the driver.
- * @iProduct: Used as iProduct override if @dev->iProduct is not set.
- *      If NULL value of @name is taken.
- * @iManufacturer: Used as iManufacturer override if @dev->iManufacturer is
- *      not set. If NULL a default "<system> <release> with <udc>" value
- *      will be used.
- * @iSerialNumber: Used as iSerialNumber override if @dev->iSerialNumber is
- *      not set.
  * @dev: Template descriptor for the device, including default device
  *      identifiers.
- * @strings: tables of strings, keyed by identifiers assigned during bind()
- *      and language IDs provided in control requests
+ * @strings: tables of strings, keyed by identifiers assigned during @bind
+ *      and language IDs provided in control requests. Note: The first entries
+ *      are predefined. The first entry that may be used is
+ *      USB_GADGET_FIRST_AVAIL_IDX
  * @max_speed: Highest speed the driver supports.
  * @needs_serial: set to 1 if the gadget needs userspace to provide
  *      a serial number.  If one is not provided, warning will be printed.
- * @unbind: Reverses bind; called as a side effect of unregistering
+ * @bind: (REQUIRED) Used to allocate resources that are shared across the
+ *      whole device, such as string IDs, and add its configurations using
+ *      @usb_add_config(). This may fail by returning a negative errno
+ *      value; it should return zero on successful initialization.
+ * @unbind: Reverses @bind; called as a side effect of unregistering
  *      this driver.
  * @disconnect: optional driver disconnect method
  * @suspend: Notifies when the host stops sending USB traffic,
@@ -271,9 +283,9 @@ void usb_remove_config(struct usb_composite_dev *,
  *      before function notifications
  *
  * Devices default to reporting self powered operation.  Devices which rely
- * on bus powered operation should report this in their @bind() method.
+ * on bus powered operation should report this in their @bind method.
  *
- * Before returning from bind, various fields in the template descriptor
+ * Before returning from @bind, various fields in the template descriptor
  * may be overridden.  These include the idVendor/idProduct/bcdDevice values
  * normally to bind the appropriate host side driver, and the three strings
  * (iManufacturer, iProduct, iSerialNumber) normally used to provide user
@@ -283,14 +295,12 @@ void usb_remove_config(struct usb_composite_dev *,
  */
 struct usb_composite_driver {
         const char                              *name;
-        const char                              *iProduct;
-        const char                              *iManufacturer;
-        const char                              *iSerialNumber;
         const struct usb_device_descriptor      *dev;
         struct usb_gadget_strings               **strings;
         enum usb_device_speed                   max_speed;
         unsigned                needs_serial:1;
 
+        int                     (*bind)(struct usb_composite_dev *cdev);
         int                     (*unbind)(struct usb_composite_dev *);
 
         void                    (*disconnect)(struct usb_composite_dev *);
@@ -298,10 +308,10 @@ struct usb_composite_driver {
         /* global suspend hooks */
         void                    (*suspend)(struct usb_composite_dev *);
         void                    (*resume)(struct usb_composite_dev *);
+        struct usb_gadget_driver                gadget_driver;
 };
 
-extern int usb_composite_probe(struct usb_composite_driver *driver,
-                               int (*bind)(struct usb_composite_dev *cdev));
+extern int usb_composite_probe(struct usb_composite_driver *driver);
 extern void usb_composite_unregister(struct usb_composite_driver *driver);
 extern void usb_composite_setup_continue(struct usb_composite_dev *cdev);
 
@@ -310,7 +320,6 @@ extern void usb_composite_setup_continue(struct usb_composite_dev *cdev);
  * struct usb_composite_device - represents one composite usb gadget
  * @gadget: read-only, abstracts the gadget's usb peripheral controller
  * @req: used for control responses; buffer is pre-allocated
- * @bufsiz: size of buffer pre-allocated in @req
  * @config: the currently active configuration
  *
  * One of these devices is allocated and initialized before the
@@ -341,7 +350,6 @@ extern void usb_composite_setup_continue(struct usb_composite_dev *cdev);
 struct usb_composite_dev {
         struct usb_gadget               *gadget;
         struct usb_request              *req;
-        unsigned                        bufsiz;
 
         struct usb_configuration        *config;
 
@@ -352,9 +360,7 @@ struct usb_composite_dev {
         struct list_head                configs;
         struct usb_composite_driver     *driver;