From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 22 Apr 2012 22:25:26 +0000 (-0700)
Subject: Merge 3.4-rc4 into usb-next.
X-Git-Tag: v3.5-rc1~149^2~328
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09091a4d5f2dd378dcf71de50b48cdacc58a8ac0;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge 3.4-rc4 into usb-next.

This resolves the conflict in:
	drivers/usb/host/ehci-fsl.c
And picks up loads of xhci bugfixes to make it easier for others to test
with.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

09091a4d5f2dd378dcf71de50b48cdacc58a8ac0
diff --cc drivers/usb/host/ehci-fsl.c
index d0a84bd,653e577..34acfce
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@@ -236,10 -246,16 +246,18 @@@ static void ehci_fsl_setup_phy(struct u
  		portsc |= PORT_PTS_PTW;
  		/* fall through */
  	case FSL_USB2_PHY_UTMI:
+ 		if (pdata->controller_ver) {
+ 			/* controller version 1.6 or above */
+ 			temp = in_be32(non_ehci + FSL_SOC_USB_CTRL);
+ 			out_be32(non_ehci + FSL_SOC_USB_CTRL, temp |
+ 				UTMI_PHY_EN | USB_CTRL_USB_EN);
+ 			mdelay(FSL_UTMI_PHY_DLY);  /* Delay for UTMI PHY CLK to
+ 						become stable - 10ms*/
+ 		}
  		/* enable UTMI PHY */
 -		setbits32(non_ehci + FSL_SOC_USB_CTRL, CTRL_UTMI_PHY_EN);
 +		if (pdata->have_sysif_regs)
 +			setbits32(non_ehci + FSL_SOC_USB_CTRL,
 +				  CTRL_UTMI_PHY_EN);
  		portsc |= PORT_PTS_UTMI;
  		break;
  	case FSL_USB2_PHY_NONE:
diff --cc drivers/usb/misc/yurex.c
index 7020146,e0388dc..1d8ad4c
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@@ -232,9 -237,11 +235,9 @@@ static int yurex_probe(struct usb_inter
  	}
  
  	/* allocate buffer for control req */
 -	dev->cntl_req = usb_alloc_coherent(dev->udev, YUREX_BUF_SIZE,
 -					   GFP_KERNEL,
 -					   &dev->cntl_urb->setup_dma);
 +	dev->cntl_req = kmalloc(YUREX_BUF_SIZE, GFP_KERNEL);
  	if (!dev->cntl_req) {
- 		err("Could not allocate cntl_req");
+ 		dev_err(&interface->dev, "Could not allocate cntl_req\n");
  		goto error;
  	}
  
@@@ -282,10 -289,10 +285,10 @@@
  			 usb_rcvintpipe(dev->udev, dev->int_in_endpointAddr),
  			 dev->int_buffer, YUREX_BUF_SIZE, yurex_interrupt,
  			 dev, 1);
 -	dev->cntl_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 +	dev->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
  	if (usb_submit_urb(dev->urb, GFP_KERNEL)) {
  		retval = -EIO;
- 		err("Could not submitting URB");
+ 		dev_err(&interface->dev, "Could not submitting URB\n");
  		goto error;
  	}