Merge tag 'usb-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

Felipe writes:

usb: patches for v3.17 merge window

Surprisingly enough, while a big set of patches, the majority is
composed of cleanups (using devm_*, fixing sparse errors, moving
code around, adding const, etc).

The highlights are addition of new support for PLX USB338x devices,
and support for USB 2.0-only configurations of the DWC3 IP core.

Signed-of-by: Felipe Balbi <balbi@ti.com>

diff --cc Documentation/DocBook/gadget.tmpl
Simple merge

diff --cc drivers/usb/dwc3/dwc3-omap.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
Simple merge

diff --cc drivers/usb/gadget/configfs.c
Simple merge

diff --cc drivers/usb/gadget/function/f_fs.c
Simple merge

diff --cc drivers/usb/gadget/function/f_rndis.c
Simple merge

diff --cc drivers/usb/gadget/function/u_ether.c
Simple merge

diff --cc drivers/usb/gadget/legacy/inode.c
Simple merge

diff --cc drivers/usb/gadget/udc/gr_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/mv_udc_core.c
Simple merge

diff --cc drivers/usb/musb/musb_cppi41.c
index 5341bb223b7cbab3b4465fed5ad83e7a4825b360,adfffe8848911e5c6a5013ba3a7589f8ef99c4e1..47ae6455d0733c2d3ef4093aa4408e98969b3644
--- 1/drivers/usb/musb/musb_cppi41.c
--- 2/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@@ -312,15 -271,13 +271,13 @@@ static void cppi41_dma_callback(void *p
                                goto out;
                        }
                }
-               if (is_isoc(hw_ep, 0)) {
-                       schedule_work(&cppi41_channel->dma_completion);
-                       goto out;
-               }
                list_add_tail(&cppi41_channel->tx_check,
                                &controller->early_tx_list);
 -              if (!hrtimer_active(&controller->early_tx)) {
 +              if (!hrtimer_is_queued(&controller->early_tx)) {
+                       unsigned long usecs = cppi41_channel->total_len / 10;
+ 
                        hrtimer_start_range_ns(&controller->early_tx,
-                               ktime_set(0, 140 * NSEC_PER_USEC),
+                               ktime_set(0, usecs * NSEC_PER_USEC),
                                40 * NSEC_PER_USEC,
                                HRTIMER_MODE_REL);
                }

diff --cc drivers/usb/musb/musb_dsps.c
Simple merge

diff --cc drivers/usb/musb/ux500.c
Simple merge

diff --cc drivers/usb/phy/phy-msm-usb.c
Simple merge

diff --cc drivers/usb/phy/phy-tegra-usb.c
Simple merge

diff --cc include/uapi/linux/usb/functionfs.h
index 24b68c59dcf85363b3bad8853392ae8a51112025,b66fae77c08cf5059e31c1fdfea20ecff5051608..0154b2859fd7dd868a65dcb30bc6455594e23b65
--- 1/include/uapi/linux/usb/functionfs.h
--- 2/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@@ -33,14 -32,37 +32,45 @@@ struct usb_endpoint_descriptor_no_audi
        __u8  bInterval;
  } __attribute__((packed));
  
 +/* Legacy format, deprecated as of 3.14. */
 +struct usb_functionfs_descs_head {
 +      __le32 magic;
 +      __le32 length;
 +      __le32 fs_count;
 +      __le32 hs_count;
 +} __attribute__((packed, deprecated));
 +
+ /* MS OS Descriptor header */
+ struct usb_os_desc_header {
+       __u8    interface;
+       __le32  dwLength;
+       __le16  bcdVersion;
+       __le16  wIndex;
+       union {
+               struct {
+                       __u8    bCount;
+                       __u8    Reserved;
+               };
+               __le16  wCount;
+       };
+ } __attribute__((packed));
+ 
+ struct usb_ext_compat_desc {
+       __u8    bFirstInterfaceNumber;
+       __u8    Reserved1;
+       __u8    CompatibleID[8];
+       __u8    SubCompatibleID[8];
+       __u8    Reserved2[6];
+ };
+ 
+ struct usb_ext_prop_desc {
+       __le32  dwSize;
+       __le32  dwPropertyDataType;
+       __le16  wPropertyNameLength;
+ } __attribute__((packed));
+ 
+ #ifndef __KERNEL__
+ 
  /*
   * Descriptors format:
   *