aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAfzal Mohammed <afzal@ti.com>2012-11-06 10:17:24 -0500
committerFelipe Balbi <balbi@ti.com>2012-11-09 01:01:54 -0500
commitd75542263a0b005876d112bbf9ffb23180cc3149 (patch)
treee1eb3207e8408950a24a15e70fdd18d4d91415ac /drivers
parentbaef653a500476ccb2d08cf4bb648c56c0170e21 (diff)
Revert "usb: musb: dsps: remove explicit NOP device creation"
This reverts commit d8c3ef256f88b7c6ecd673d03073b5645be9c5e4. Above mentioned change was made along with multi usb phy change and adding DT support for nop transceiver. But other two changes did not make it to mainline. This in effect makes dsps musb wrapper unusable even for single instance. Hence revert it so that at least single instance can be supported. Cc: stable@vger.kernel.org # v3.7 Signed-off-by: Afzal Mohammed <afzal@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/musb/musb_dsps.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 6053af1f57c1..e770f7984b5f 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -411,7 +411,8 @@ static int dsps_musb_init(struct musb *musb)
411 /* mentor core register starts at offset of 0x400 from musb base */ 411 /* mentor core register starts at offset of 0x400 from musb base */
412 musb->mregs += wrp->musb_core_offset; 412 musb->mregs += wrp->musb_core_offset;
413 413
414 /* Get the NOP PHY */ 414 /* NOP driver needs change if supporting dual instance */
415 usb_nop_xceiv_register();
415 musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); 416 musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
416 if (IS_ERR_OR_NULL(musb->xceiv)) 417 if (IS_ERR_OR_NULL(musb->xceiv))
417 return -ENODEV; 418 return -ENODEV;