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>

6 files changed, 21 insertions, 19 deletions

diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index b556a72264d..481effdc7f5 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -142,7 +142,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
         if (pdata->operating_mode == FSL_USB2_DR_OTG) {
                 struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
-                ehci->transceiver = otg_get_transceiver();
+                ehci->transceiver = usb_get_transceiver();
                 dev_dbg(&pdev->dev, "hcd=0x%p  ehci=0x%p, transceiver=0x%p\n",
                         hcd, ehci, ehci->transceiver);
 
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index ef7c4319c6e..d8db5ecf5e3 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -32,7 +32,7 @@
 
 #define MSM_USB_BASE (hcd->regs)
 
-static struct usb_phy *otg;
+static struct usb_phy *phy;
 
 static int ehci_msm_reset(struct usb_hcd *hcd)
 {
@@ -145,14 +145,14 @@ static int ehci_msm_probe(struct platform_device *pdev)
          * powering up VBUS, mapping of registers address space and power
          * management.
          */
-        otg = otg_get_transceiver();
-        if (!otg) {
+        phy = usb_get_transceiver();
+        if (!phy) {
                 dev_err(&pdev->dev, "unable to find transceiver\n");
                 ret = -ENODEV;
                 goto unmap;
         }
 
-        ret = otg_set_host(otg, &hcd->self);
+        ret = otg_set_host(phy, &hcd->self);
         if (ret < 0) {
                 dev_err(&pdev->dev, "unable to register with transceiver\n");
                 goto put_transceiver;
@@ -169,7 +169,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
         return 0;
 
 put_transceiver:
-        otg_put_transceiver(otg);
+        usb_put_transceiver(phy);
 unmap:
         iounmap(hcd->regs);
 put_hcd:
@@ -186,8 +186,8 @@ static int __devexit ehci_msm_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
         pm_runtime_set_suspended(&pdev->dev);
 
-        otg_set_host(otg, NULL);
-        otg_put_transceiver(otg);
+        otg_set_host(phy, NULL);
+        usb_put_transceiver(phy);
 
         usb_put_hcd(hcd);
 
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 39ca79e008d..62a63b59814 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -253,7 +253,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
         ehci_mv->mode = pdata->mode;
         if (ehci_mv->mode == MV_USB_MODE_OTG) {
 #ifdef CONFIG_USB_OTG_UTILS
-                ehci_mv->otg = otg_get_transceiver();
+                ehci_mv->otg = usb_get_transceiver();
                 if (!ehci_mv->otg) {
                         dev_err(&pdev->dev,
                                 "unable to find transceiver\n");
@@ -303,7 +303,7 @@ err_set_vbus:
 #ifdef CONFIG_USB_OTG_UTILS
 err_put_transceiver:
         if (ehci_mv->otg)
-                otg_put_transceiver(ehci_mv->otg);
+                usb_put_transceiver(ehci_mv->otg);
 #endif
 err_disable_clk:
         mv_ehci_disable(ehci_mv);
@@ -333,7 +333,7 @@ static int mv_ehci_remove(struct platform_device *pdev)
 
         if (ehci_mv->otg) {
                 otg_set_host(ehci_mv->otg, NULL);
-                otg_put_transceiver(ehci_mv->otg);
+                usb_put_transceiver(ehci_mv->otg);
         }
 
         if (ehci_mv->mode == MV_USB_MODE_HOST) {
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 55978fcfa4b..b762fe0955b 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);
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 2e157144dcf..701a0bf5862 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -733,7 +733,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_USB_OTG_UTILS
         if (pdata->operating_mode == TEGRA_USB_OTG) {
-                tegra->transceiver = otg_get_transceiver();
+                tegra->transceiver = usb_get_transceiver();
                 if (tegra->transceiver)
                         otg_set_host(tegra->transceiver, &hcd->self);
         }
@@ -751,7 +751,7 @@ fail:
 #ifdef CONFIG_USB_OTG_UTILS
         if (tegra->transceiver) {
                 otg_set_host(tegra->transceiver, NULL);
-                otg_put_transceiver(tegra->transceiver);
+                usb_put_transceiver(tegra->transceiver);
         }
 #endif
         tegra_usb_phy_close(tegra->phy);
@@ -809,7 +809,7 @@ static int tegra_ehci_remove(struct platform_device *pdev)
 #ifdef CONFIG_USB_OTG_UTILS
         if (tegra->transceiver) {
                 otg_set_host(tegra->transceiver, NULL);
-                otg_put_transceiver(tegra->transceiver);
+                usb_put_transceiver(tegra->transceiver);
         }
 #endif
 
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index db3968656d2..744e25da800 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -210,7 +210,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
 
 #ifdef  CONFIG_USB_OTG
         if (need_transceiver) {
-                ohci->transceiver = otg_get_transceiver();
+                ohci->transceiver = usb_get_transceiver();
                 if (ohci->transceiver) {
                         int     status = otg_set_host(ohci->transceiver,
                                                 &ohci_to_hcd(ohci)->self);