---

yaml --- r: 338603 b: refs/heads/master c: d755422 h: refs/heads/master i: 338601: b8ca987 338599: 678016f v: v3
git-mirror · Nov 9, 2012 · 3336c51 · 3336c51
1 parent 85cc2bb
commit 3336c51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baef653a500476ccb2d08cf4bb648c56c0170e21
+refs/heads/master: d75542263a0b005876d112bbf9ffb23180cc3149
diff --git a/trunk/drivers/usb/musb/musb_dsps.c b/trunk/drivers/usb/musb/musb_dsps.c
@@ -411,7 +411,8 @@ static int dsps_musb_init(struct musb *musb)
 	/* mentor core register starts at offset of 0x400 from musb base */
 	musb->mregs += wrp->musb_core_offset;
 
-	/* Get the NOP PHY */
+	/* NOP driver needs change if supporting dual instance */
+	usb_nop_xceiv_register();
 	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
 	if (IS_ERR_OR_NULL(musb->xceiv))
 		return -ENODEV;