From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 25 Jan 2013 17:09:46 +0000 (-0800)
Subject: Merge tag 'xceiv-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4811f53fada7f2c6616229cc410e79362818a613;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'xceiv-for-v3.9' of git://git./linux/kernel/git/balbi/usb into usb-next

Felipe writes:
	usb: xceiv: patches for v3.9 merge window

	Two new PHY drivers coming here: one for Samsung,
	one for OMAP. Both architectures are adding USB3
	support to mainline kernel.

	The PHY layer now allows us to have mulitple PHYs
	of the same type, which is necessary for platforms
	which provide more than one USB peripheral port.

	There's also a few cleanups here: removal of __dev*
	annotations, conversion of a cast to to_delayed_work(),
	and mxs-phy learns about ->set_suspend.
---

4811f53fada7f2c6616229cc410e79362818a613
diff --cc drivers/usb/musb/omap2430.c
index bb48796e5213,d100360eab7a..1762354fe793
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@@ -366,10 -345,15 +345,15 @@@ static int omap2430_musb_init(struct mu
  	 * up through ULPI.  TWL4030-family PMICs include one,
  	 * which needs a driver, drivers aren't always needed.
  	 */
- 	musb->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+ 	if (dev->parent->of_node)
+ 		musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent,
+ 		    "usb-phy", 0);
+ 	else
+ 		musb->xceiv = devm_usb_get_phy_dev(dev, 0);
+ 
  	if (IS_ERR_OR_NULL(musb->xceiv)) {
  		pr_err("HS USB OTG: no transceiver configured\n");
 -		return -ENODEV;
 +		return -EPROBE_DEFER;
  	}
  
  	musb->isr = omap2430_musb_interrupt;