From 7015a7a582dc66ab7b242bdac6c33ffac1834cd1 Mon Sep 17 00:00:00 2001 From: Ajay Kumar Gupta Date: Fri, 31 Aug 2012 11:09:56 +0000 Subject: [PATCH] --- yaml --- r: 325997 b: refs/heads/master c: d8c3ef256f88b7c6ecd673d03073b5645be9c5e4 h: refs/heads/master i: 325995: d270f4ddc831f7c814287a4578a28d553713bc08 v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_dsps.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b638e34280b..cf5b671234ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65145677a65c31a8fd2704e244801bdb11061f9a +refs/heads/master: d8c3ef256f88b7c6ecd673d03073b5645be9c5e4 diff --git a/trunk/drivers/usb/musb/musb_dsps.c b/trunk/drivers/usb/musb/musb_dsps.c index b8aecbba7407..2785e28ec4a9 100644 --- a/trunk/drivers/usb/musb/musb_dsps.c +++ b/trunk/drivers/usb/musb/musb_dsps.c @@ -376,8 +376,7 @@ 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; - /* NOP driver needs change if supporting dual instance */ - usb_nop_xceiv_register(); + /* Get the NOP PHY */ musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); if (IS_ERR_OR_NULL(musb->xceiv)) return -ENODEV;