From 3336c51d294efd4d4b9c77f706f615d3772833cf Mon Sep 17 00:00:00 2001 From: Afzal Mohammed Date: Tue, 6 Nov 2012 20:47:24 +0530 Subject: [PATCH] --- yaml --- r: 338603 b: refs/heads/master c: d75542263a0b005876d112bbf9ffb23180cc3149 h: refs/heads/master i: 338601: b8ca9872647855fe6d54194bb80f36511c6a5095 338599: 678016f2036c73129c787663ed409660012fa38d v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_dsps.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9bad0c066d23..e34e43f3154b 100644 --- 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 index 6053af1f57c1..e770f7984b5f 100644 --- 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;