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).

1 files changed, 18 insertions, 17 deletions

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index da430c31ebef..2ae0bb309994 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -132,6 +132,7 @@ static void omap2430_musb_try_idle(struct musb *musb, unsigned long timeout)
 
 static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
 {
+        struct usb_otg  *otg = musb->xceiv->otg;
         u8              devctl;
         unsigned long timeout = jiffies + msecs_to_jiffies(1000);
         int ret = 1;
@@ -163,11 +164,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
                                 }
                         }
 
-                        if (ret && musb->xceiv->set_vbus)
-                                otg_set_vbus(musb->xceiv, 1);
+                        if (ret && otg->set_vbus)
+                                otg_set_vbus(otg, 1);
                 } else {
                         musb->is_active = 1;
-                        musb->xceiv->default_a = 1;
+                        otg->default_a = 1;
                         musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
                         devctl |= MUSB_DEVCTL_SESSION;
                         MUSB_HST_MODE(musb);
@@ -179,7 +180,7 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
                  * jumping right to B_IDLE...
                  */
 
-                musb->xceiv->default_a = 0;
+                otg->default_a = 0;
                 musb->xceiv->state = OTG_STATE_B_IDLE;
                 devctl &= ~MUSB_DEVCTL_SESSION;
 
@@ -246,7 +247,7 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
 
                 if (!is_otg_enabled(musb) || musb->gadget_driver) {
                         pm_runtime_get_sync(musb->controller);
-                        otg_init(musb->xceiv);
+                        usb_phy_init(musb->xceiv);
                         omap2430_musb_set_vbus(musb, 1);
                 }
                 break;
@@ -256,7 +257,7 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
 
                 if (musb->gadget_driver)
                         pm_runtime_get_sync(musb->controller);
-                otg_init(musb->xceiv);
+                usb_phy_init(musb->xceiv);
                 break;
 
         case USB_EVENT_NONE:
@@ -269,10 +270,10 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
                         }
 
                 if (data->interface_type == MUSB_INTERFACE_UTMI) {
-                        if (musb->xceiv->set_vbus)
-                                otg_set_vbus(musb->xceiv, 0);
+                        if (musb->xceiv->otg->set_vbus)
+                                otg_set_vbus(musb->xceiv->otg, 0);
                 }
-                otg_shutdown(musb->xceiv);
+                usb_phy_shutdown(musb->xceiv);
                 break;
         default:
                 dev_dbg(musb->controller, "ID float\n");
@@ -290,7 +291,7 @@ static int omap2430_musb_init(struct musb *musb)
          * up through ULPI.  TWL4030-family PMICs include one,
          * which needs a driver, drivers aren't always needed.
          */
-        musb->xceiv = otg_get_transceiver();
+        musb->xceiv = usb_get_transceiver();
         if (!musb->xceiv) {
                 pr_err("HS USB OTG: no transceiver configured\n");
                 return -ENODEV;
@@ -325,7 +326,7 @@ static int omap2430_musb_init(struct musb *musb)
                         musb_readl(musb->mregs, OTG_SIMENABLE));
 
         musb->nb.notifier_call = musb_otg_notifications;
-        status = otg_register_notifier(musb->xceiv, &musb->nb);
+        status = usb_register_notifier(musb->xceiv, &musb->nb);
 
         if (status)
                 dev_dbg(musb->controller, "notification register failed\n");
@@ -349,7 +350,7 @@ static void omap2430_musb_enable(struct musb *musb)
         switch (musb->xceiv->last_event) {
 
         case USB_EVENT_ID:
-                otg_init(musb->xceiv);
+                usb_phy_init(musb->xceiv);
                 if (data->interface_type != MUSB_INTERFACE_UTMI)
                         break;
                 devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
@@ -368,7 +369,7 @@ static void omap2430_musb_enable(struct musb *musb)
                 break;
 
         case USB_EVENT_VBUS:
-                otg_init(musb->xceiv);
+                usb_phy_init(musb->xceiv);
                 break;
 
         default:
@@ -379,7 +380,7 @@ static void omap2430_musb_enable(struct musb *musb)
 static void omap2430_musb_disable(struct musb *musb)
 {
         if (musb->xceiv->last_event)
-                otg_shutdown(musb->xceiv);
+                usb_phy_shutdown(musb->xceiv);
 }
 
 static int omap2430_musb_exit(struct musb *musb)
@@ -388,7 +389,7 @@ static int omap2430_musb_exit(struct musb *musb)
         cancel_work_sync(&musb->otg_notifier_work);
 
         omap2430_low_level_exit(musb);
-        otg_put_transceiver(musb->xceiv);
+        usb_put_transceiver(musb->xceiv);
 
         return 0;
 }
@@ -494,7 +495,7 @@ static int omap2430_runtime_suspend(struct device *dev)
                                                 OTG_INTERFSEL);
 
         omap2430_low_level_exit(musb);
-        otg_set_suspend(musb->xceiv, 1);
+        usb_phy_set_suspend(musb->xceiv, 1);
 
         return 0;
 }
@@ -508,7 +509,7 @@ static int omap2430_runtime_resume(struct device *dev)
         musb_writel(musb->mregs, OTG_INTERFSEL,
                                         musb->context.otg_interfsel);
 
-        otg_set_suspend(musb->xceiv, 0);
+        usb_phy_set_suspend(musb->xceiv, 0);
 
         return 0;
 }