Merge tag 'v3.17-rc5' into next

Linux 3.17-rc5

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
	Documentation/devicetree/bindings/usb/mxs-phy.txt
	drivers/usb/phy/phy-mxs-usb.c

diff --cc Documentation/devicetree/bindings/usb/mxs-phy.txt
index fe3eed89e4c3b93d37c91857cbd67628aae94da1,96681c93b86df38788327df42c543738293265ea..379b84a567ccb82442b1275c43cdc9d6d518c075
--- 1/Documentation/devicetree/bindings/usb/mxs-phy.txt
--- 2/Documentation/devicetree/bindings/usb/mxs-phy.txt
+++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt
@@@ -5,7 -5,7 +5,8 @@@ Required properties
        * "fsl,imx23-usbphy" for imx23 and imx28
        * "fsl,imx6q-usbphy" for imx6dq and imx6dl
        * "fsl,imx6sl-usbphy" for imx6sl
 +      * "fsl,vf610-usbphy" for Vybrid vf610
+       * "fsl,imx6sx-usbphy" for imx6sx
    "fsl,imx23-usbphy" is still a fallback for other strings
  - reg: Should contain registers location and length
  - interrupts: Should contain phy interrupt

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/usb/dwc3/gadget.c
index f2dbaca5df2cf6de7afc958dcba50f67894f1ec6,490a6ca0073369844b40eff51f88b2cbfd353bce..0fcc0a35ae05fdc7df2f3c73422231c3ae8fa9ca
--- 1/drivers/usb/dwc3/gadget.c
--- 2/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -1145,9 -1235,7 +1147,8 @@@ static int dwc3_gadget_ep_queue(struct 
  
        dev_vdbg(dwc->dev, "queing request %p to %s length %d\n",
                        request, ep->name, request->length);
 +      trace_dwc3_ep_queue(req);
  
-       spin_lock_irqsave(&dwc->lock, flags);
        ret = __dwc3_gadget_ep_queue(dep, req);
        spin_unlock_irqrestore(&dwc->lock, flags);
  

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

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

diff --cc drivers/usb/phy/phy-mxs-usb.c
index 8c2f23b75d6d19267f532513ab4ef1811d3b9a7f,00972eca04e7f5d4965f32fd0944c453f5291f07..0e0c41587a08b77cea9e49178de1c420a67405dc
--- 1/drivers/usb/phy/phy-mxs-usb.c
--- 2/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@@ -125,12 -125,13 +125,18 @@@ static const struct mxs_phy_data imx6sl
                MXS_PHY_NEED_IP_FIX,
  };
  
 +static const struct mxs_phy_data vf610_phy_data = {
 +      .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
 +              MXS_PHY_NEED_IP_FIX,
 +};
 +
+ static const struct mxs_phy_data imx6sx_phy_data = {
+       .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
+               MXS_PHY_NEED_IP_FIX,
+ };
+ 
  static const struct of_device_id mxs_phy_dt_ids[] = {
+       { .compatible = "fsl,imx6sx-usbphy", .data = &imx6sx_phy_data, },
        { .compatible = "fsl,imx6sl-usbphy", .data = &imx6sl_phy_data, },
        { .compatible = "fsl,imx6q-usbphy", .data = &imx6q_phy_data, },
        { .compatible = "fsl,imx23-usbphy", .data = &imx23_phy_data, },