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, 6 insertions, 4 deletions

diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 55978fcfa4b2..b762fe0955b9 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -220,7 +220,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
         /* Initialize the transceiver */
         if (pdata->otg) {
                 pdata->otg->io_priv = hcd->regs + ULPI_VIEWPORT_OFFSET;
-                ret = otg_init(pdata->otg);
+                ret = usb_phy_init(pdata->otg);
                 if (ret) {
                         dev_err(dev, "unable to init transceiver, probably missing\n");
                         ret = -ENODEV;
@@ -247,9 +247,11 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
                  * It's in violation of USB specs
                  */
                 if (machine_is_mx51_efikamx() || machine_is_mx51_efikasb()) {
-                        flags = otg_io_read(pdata->otg, ULPI_OTG_CTRL);
+                        flags = usb_phy_io_read(pdata->otg,
+                                                        ULPI_OTG_CTRL);
                         flags |= ULPI_OTG_CTRL_CHRGVBUS;
-                        ret = otg_io_write(pdata->otg, flags, ULPI_OTG_CTRL);
+                        ret = usb_phy_io_write(pdata->otg, flags,
+                                                        ULPI_OTG_CTRL);
                         if (ret) {
                                 dev_err(dev, "unable to set CHRVBUS\n");
                                 goto err_add;
@@ -297,7 +299,7 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
                 pdata->exit(pdev);
 
         if (pdata->otg)
-                otg_shutdown(pdata->otg);
+                usb_phy_shutdown(pdata->otg);
 
         usb_remove_hcd(hcd);
         iounmap(hcd->regs);