Merge tag 'xceiv-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

USB: transceiver changes for 3.4

Here we have a big rework done by Heikki Krogerus (thanks) which
splits OTG functionality away from transceivers.

We have known for quite a long time that struct otg_transceiver was
a bad name for the structure, considering transceiver is far from
being OTG-specific (see 4e67185).

9 files changed, 37 insertions, 35 deletions

diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 7a15c2235758..cf5666735a8f 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -142,12 +142,12 @@ 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);
 
                 if (ehci->transceiver) {
-                        retval = otg_set_host(ehci->transceiver,
+                        retval = otg_set_host(ehci->transceiver->otg,
                                               &ehci_to_hcd(ehci)->self);
                         if (retval) {
                                 if (ehci->transceiver)
@@ -194,7 +194,7 @@ static void usb_hcd_fsl_remove(struct usb_hcd *hcd,
         struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
         if (ehci->transceiver) {
-                otg_set_host(ehci->transceiver, NULL);
+                otg_set_host(ehci->transceiver->otg, NULL);
                 put_device(ehci->transceiver->dev);
         }
 
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 01011dd0cb5d..256fbd42e48c 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -727,7 +727,7 @@ static int ehci_hub_control (
 #ifdef CONFIG_USB_OTG
                         if ((hcd->self.otg_port == (wIndex + 1))
                             && hcd->self.b_hnp_enable) {
-                                otg_start_hnp(ehci->transceiver);
+                                otg_start_hnp(ehci->transceiver->otg);
                                 break;
                         }
 #endif
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 592d5f76803e..9803a55fd5f4 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 otg_transceiver *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->otg, &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->otg, 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 52a604fb9321..a936bbcff8f4 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -28,7 +28,7 @@ struct ehci_hcd_mv {
         void __iomem *cap_regs;
         void __iomem *op_regs;
 
-        struct otg_transceiver *otg;
+        struct usb_phy *otg;
 
         struct mv_usb_platform_data *pdata;
 
@@ -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");
@@ -261,7 +261,7 @@ static int mv_ehci_probe(struct platform_device *pdev)
                         goto err_disable_clk;
                 }
 
-                retval = otg_set_host(ehci_mv->otg, &hcd->self);
+                retval = otg_set_host(ehci_mv->otg->otg, &hcd->self);
                 if (retval < 0) {
                         dev_err(&pdev->dev,
                                 "unable to register with 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);
@@ -332,8 +332,8 @@ static int mv_ehci_remove(struct platform_device *pdev)
                 usb_remove_hcd(hcd);
 
         if (ehci_mv->otg) {
-                otg_set_host(ehci_mv->otg, NULL);
-                otg_put_transceiver(ehci_mv->otg);
+                otg_set_host(ehci_mv->otg->otg, NULL);
+                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 55978fcfa4b2..a797d51ecbe8 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -220,13 +220,13 @@ 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;
                         goto err_add;
                 }
-                ret = otg_set_vbus(pdata->otg, 1);
+                ret = otg_set_vbus(pdata->otg->otg, 1);
                 if (ret) {
                         dev_err(dev, "unable to enable vbus on transceiver\n");
                         goto err_add;
@@ -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 dbc7fe8ca9e7..3de48a2d7955 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -35,7 +35,7 @@ struct tegra_ehci_hcd {
         struct tegra_usb_phy *phy;
         struct clk *clk;
         struct clk *emc_clk;
-        struct otg_transceiver *transceiver;
+        struct usb_phy *transceiver;
         int host_resumed;
         int bus_suspended;
         int port_resuming;
@@ -733,9 +733,9 @@ 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);
+                        otg_set_host(tegra->transceiver->otg, &hcd->self);
         }
 #endif
 
@@ -750,8 +750,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 fail:
 #ifdef CONFIG_USB_OTG_UTILS
         if (tegra->transceiver) {
-                otg_set_host(tegra->transceiver, NULL);
-                otg_put_transceiver(tegra->transceiver);
+                otg_set_host(tegra->transceiver->otg, NULL);
+                usb_put_transceiver(tegra->transceiver);
         }
 #endif
         tegra_usb_phy_close(tegra->phy);
@@ -808,8 +808,8 @@ 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);
+                otg_set_host(tegra->transceiver->otg, NULL);
+                usb_put_transceiver(tegra->transceiver);
         }
 #endif
 
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 0a5fda73b3f2..8f9acbc96fde 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -176,7 +176,7 @@ struct ehci_hcd {			/* one per controller */
         /*
          * OTG controllers and transceivers need software interaction
          */
-        struct otg_transceiver  *transceiver;
+        struct usb_phy  *transceiver;
 };
 
 /* convert between an HCD pointer and the corresponding EHCI_HCD */
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index db3968656d21..96451e41ee8a 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -171,7 +171,7 @@ static void start_hnp(struct ohci_hcd *ohci)
         unsigned long   flags;
         u32 l;
 
-        otg_start_hnp(ohci->transceiver);
+        otg_start_hnp(ohci->transceiver->otg);
 
         local_irq_save(flags);
         ohci->transceiver->state = OTG_STATE_A_SUSPEND;
@@ -210,9 +210,9 @@ 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,
+                        int     status = otg_set_host(ohci->transceiver->otg,
                                                 &ohci_to_hcd(ohci)->self);
                         dev_dbg(hcd->self.controller, "init %s transceiver, status %d\n",
                                         ohci->transceiver->label, status);
@@ -404,7 +404,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
 
         usb_remove_hcd(hcd);
         if (ohci->transceiver) {
-                (void) otg_set_host(ohci->transceiver, 0);
+                (void) otg_set_host(ohci->transceiver->otg, 0);
                 put_device(ohci->transceiver->dev);
         }
         if (machine_is_omap_osk())
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 8ff6f7ea96fd..1b19aea25a2b 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -376,7 +376,7 @@ struct ohci_hcd {
          * OTG controllers and transceivers need software interaction;
          * other external transceivers should be software-transparent
          */
-        struct otg_transceiver  *transceiver;
+        struct usb_phy  *transceiver;
         void (*start_hnp)(struct ohci_hcd *ohci);
 
         /*