From e888fdf042b02caf7f6689b7cc9646746f2fb3fa Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Fri, 25 Jan 2013 08:03:26 +0530
Subject: [PATCH] --- yaml --- r: 354695 b: refs/heads/master c:
 b16604f2c1dc3f0a326818b282e6bb5f363f725e h: refs/heads/master i:   354693:
 18efd27e24f202ce8108650400582e0e50339d26   354691:
 57778bb3181bb88c5d5ec909b21284df97e8eafc   354687:
 2702aa0d1786d62c9e7d7ee1468715e3e7e60c84 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/musb/omap2430.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 89ecfbb5ade9..76bcac6e3d9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c11747f6ce70253dbf73709bb0a5ff19acc48ec8
+refs/heads/master: b16604f2c1dc3f0a326818b282e6bb5f363f725e
diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c
index 23df9d7c99f6..d100360eab7a 100644
--- a/trunk/drivers/usb/musb/omap2430.c
+++ b/trunk/drivers/usb/musb/omap2430.c
@@ -345,7 +345,12 @@ static int omap2430_musb_init(struct musb *musb)
 	 * up through ULPI.  TWL4030-family PMICs include one,
 	 * which needs a driver, drivers aren't always needed.
 	 */
-	musb->xceiv = devm_usb_get_phy_dev(dev, 0);
+	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;