aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/davinci.c
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2012-02-13 06:24:18 -0500
committerFelipe Balbi <balbi@ti.com>2012-02-27 08:41:48 -0500
commitb96d3b08365f5a9603f50f3aadca6012f7eaffa1 (patch)
treefceda0fed3b03c96353dc8cd21a965ba986e3e09 /drivers/usb/musb/davinci.c
parentb1c711d629358576e8896a18e74cd5f4d811d7f7 (diff)
usb: Convert all users to new usb_phy
Use the new usb_phy_* functions with transceiver operations instead of the old otg functions. Includes fixes from Sascha Hauer. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Pavankumar Kondeti <pkondeti@codeaurora.org> Acked-by: Li Yang <leoli@freescale.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/davinci.c')
-rw-r--r--drivers/usb/musb/davinci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index f2a63dd0dfce..49a47d244a27 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -384,7 +384,7 @@ static int davinci_musb_init(struct musb *musb)
384 u32 revision; 384 u32 revision;
385 385
386 usb_nop_xceiv_register(); 386 usb_nop_xceiv_register();
387 musb->xceiv = otg_get_transceiver(); 387 musb->xceiv = usb_get_transceiver();
388 if (!musb->xceiv) 388 if (!musb->xceiv)
389 return -ENODEV; 389 return -ENODEV;
390 390
@@ -443,7 +443,7 @@ static int davinci_musb_init(struct musb *musb)
443 return 0; 443 return 0;
444 444
445fail: 445fail:
446 otg_put_transceiver(musb->xceiv); 446 usb_put_transceiver(musb->xceiv);
447 usb_nop_xceiv_unregister(); 447 usb_nop_xceiv_unregister();
448 return -ENODEV; 448 return -ENODEV;
449} 449}
@@ -492,7 +492,7 @@ static int davinci_musb_exit(struct musb *musb)
492 492
493 phy_off(); 493 phy_off();
494 494
495 otg_put_transceiver(musb->xceiv); 495 usb_put_transceiver(musb->xceiv);
496 usb_nop_xceiv_unregister(); 496 usb_nop_xceiv_unregister();
497 497
498 return 0; 498 return 0;