From: Felipe Balbi <balbi@ti.com>
Date: Tue, 16 Sep 2014 14:53:59 +0000 (-0500)
Subject: Merge tag 'v3.17-rc5' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4cd41ffd27b6b775445ecfdb72b592b71d6b4a32;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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
---

4cd41ffd27b6b775445ecfdb72b592b71d6b4a32
diff --cc Documentation/devicetree/bindings/usb/mxs-phy.txt
index fe3eed89e4c3,96681c93b86d..379b84a567cc
--- a/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 drivers/usb/dwc3/gadget.c
index f2dbaca5df2c,490a6ca00733..0fcc0a35ae05
--- a/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/phy/phy-mxs-usb.c
index 8c2f23b75d6d,00972eca04e7..0e0c41587a08
--- a/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, },