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>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index d3529787351d..e82c6995ce26 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -1345,7 +1345,7 @@ static int omap_vbus_draw(struct usb_gadget *gadget, unsigned mA)
 
         udc = container_of(gadget, struct omap_udc, gadget);
         if (udc->transceiver)
-                return otg_set_power(udc->transceiver, mA);
+                return usb_phy_set_power(udc->transceiver, mA);
         return -EOPNOTSUPP;
 }
 
@@ -1839,11 +1839,13 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
                                         spin_lock(&udc->lock);
                                 }
                                 if (udc->transceiver)
-                                        otg_set_suspend(udc->transceiver, 1);
+                                        usb_phy_set_suspend(
+                                                        udc->transceiver, 1);
                         } else {
                                 VDBG("resume\n");
                                 if (udc->transceiver)
-                                        otg_set_suspend(udc->transceiver, 0);
+                                        usb_phy_set_suspend(
+                                                        udc->transceiver, 0);
                                 if (udc->gadget.speed == USB_SPEED_FULL
                                                 && udc->driver->resume) {
                                         spin_unlock(&udc->lock);
@@ -2863,7 +2865,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
                  * use it.  Except for OTG, we don't _need_ to talk to one;
                  * but not having one probably means no VBUS detection.
                  */
-                xceiv = otg_get_transceiver();
+                xceiv = usb_get_transceiver();
                 if (xceiv)
                         type = xceiv->label;
                 else if (config->otg) {
@@ -3009,7 +3011,7 @@ cleanup1:
 
 cleanup0:
         if (xceiv)
-                otg_put_transceiver(xceiv);
+                usb_put_transceiver(xceiv);
 
         if (cpu_is_omap16xx() || cpu_is_omap24xx() || cpu_is_omap7xx()) {
                 clk_disable(hhc_clk);
@@ -3039,7 +3041,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
 
         pullup_disable(udc);
         if (udc->transceiver) {
-                otg_put_transceiver(udc->transceiver);
+                usb_put_transceiver(udc->transceiver);
                 udc->transceiver = NULL;
         }
         omap_writew(0, UDC_SYSCON1);