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

Felipe writes:
	usb: xceiv: patches for v3.9 merge window

	Two new PHY drivers coming here: one for Samsung,
	one for OMAP. Both architectures are adding USB3
	support to mainline kernel.

	The PHY layer now allows us to have mulitple PHYs
	of the same type, which is necessary for platforms
	which provide more than one USB peripheral port.

	There's also a few cleanups here: removal of __dev*
	annotations, conversion of a cast to to_delayed_work(),
	and mxs-phy learns about ->set_suspend.

1 files changed, 29 insertions, 46 deletions

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index bb48796e5213..1762354fe793 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -37,6 +37,7 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/usb/musb-omap.h>
+#include <linux/usb/omap_control_usb.h>
 
 #include "musb_core.h"
 #include "omap2430.h"
@@ -46,7 +47,7 @@ struct omap2430_glue {
         struct platform_device  *musb;
         enum omap_musb_vbus_id_status status;
         struct work_struct      omap_musb_mailbox_work;
-        u32 __iomem             *control_otghs;
+        struct device           *control_otghs;
 };
 #define glue_to_musb(g)         platform_get_drvdata(g->musb)
 
@@ -54,26 +55,6 @@ struct omap2430_glue		*_glue;
 
 static struct timer_list musb_idle_timer;
 
-/**
- * omap4_usb_phy_mailbox - write to usb otg mailbox
- * @glue: struct omap2430_glue *
- * @val: the value to be written to the mailbox
- *
- * On detection of a device (ID pin is grounded), this API should be called
- * to set AVALID, VBUSVALID and ID pin is grounded.
- *
- * When OMAP is connected to a host (OMAP in device mode), this API
- * is called to set AVALID, VBUSVALID and ID pin in high impedance.
- *
- * XXX: This function will be removed once we have a seperate driver for
- * control module
- */
-static void omap4_usb_phy_mailbox(struct omap2430_glue *glue, u32 val)
-{
-        if (glue->control_otghs)
-                writel(val, glue->control_otghs);
-}
-
 static void musb_do_idle(unsigned long _musb)
 {
         struct musb     *musb = (void *)_musb;
@@ -269,7 +250,6 @@ EXPORT_SYMBOL_GPL(omap_musb_mailbox);
 
 static void omap_musb_set_mailbox(struct omap2430_glue *glue)
 {
-        u32 val;
         struct musb *musb = glue_to_musb(glue);
         struct device *dev = musb->controller;
         struct musb_hdrc_platform_data *pdata = dev->platform_data;
@@ -285,8 +265,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 musb->xceiv->last_event = USB_EVENT_ID;
                 if (musb->gadget_driver) {
                         pm_runtime_get_sync(dev);
-                        val = AVALID | VBUSVALID;
-                        omap4_usb_phy_mailbox(glue, val);
+                        omap_control_usb_set_mode(glue->control_otghs,
+                                USB_MODE_HOST);
                         omap2430_musb_set_vbus(musb, 1);
                 }
                 break;
@@ -299,8 +279,7 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 musb->xceiv->last_event = USB_EVENT_VBUS;
                 if (musb->gadget_driver)
                         pm_runtime_get_sync(dev);
-                val = IDDIG | AVALID | VBUSVALID;
-                omap4_usb_phy_mailbox(glue, val);
+                omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);
                 break;
 
         case OMAP_MUSB_ID_FLOAT:
@@ -317,8 +296,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                         if (musb->xceiv->otg->set_vbus)
                                 otg_set_vbus(musb->xceiv->otg, 0);
                 }
-                val = SESSEND | IDDIG;
-                omap4_usb_phy_mailbox(glue, val);
+                omap_control_usb_set_mode(glue->control_otghs,
+                        USB_MODE_DISCONNECT);
                 break;
         default:
                 dev_dbg(dev, "ID float\n");
@@ -366,7 +345,12 @@ 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 = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+        if (dev->parent->of_node)
+                musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent,
+                    "usb-phy", 0);
+        else
+                musb->xceiv = devm_usb_get_phy_dev(dev, 0);
+
         if (IS_ERR_OR_NULL(musb->xceiv)) {
                 pr_err("HS USB OTG: no transceiver configured\n");
                 return -EPROBE_DEFER;
@@ -415,7 +399,6 @@ err1:
 static void omap2430_musb_enable(struct musb *musb)
 {
         u8              devctl;
-        u32             val;
         unsigned long timeout = jiffies + msecs_to_jiffies(1000);
         struct device *dev = musb->controller;
         struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
@@ -425,8 +408,7 @@ static void omap2430_musb_enable(struct musb *musb)
         switch (glue->status) {
 
         case OMAP_MUSB_ID_GROUND:
-                val = AVALID | VBUSVALID;
-                omap4_usb_phy_mailbox(glue, val);
+                omap_control_usb_set_mode(glue->control_otghs, USB_MODE_HOST);
                 if (data->interface_type != MUSB_INTERFACE_UTMI)
                         break;
                 devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
@@ -445,8 +427,7 @@ static void omap2430_musb_enable(struct musb *musb)
                 break;
 
         case OMAP_MUSB_VBUS_VALID:
-                val = IDDIG | AVALID | VBUSVALID;
-                omap4_usb_phy_mailbox(glue, val);
+                omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);
                 break;
 
         default:
@@ -456,14 +437,12 @@ static void omap2430_musb_enable(struct musb *musb)
 
 static void omap2430_musb_disable(struct musb *musb)
 {
-        u32 val;
         struct device *dev = musb->controller;
         struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
 
-        if (glue->status != OMAP_MUSB_UNKNOWN) {
-                val = SESSEND | IDDIG;
-                omap4_usb_phy_mailbox(glue, val);
-        }
+        if (glue->status != OMAP_MUSB_UNKNOWN)
+                omap_control_usb_set_mode(glue->control_otghs,
+                        USB_MODE_DISCONNECT);
 }
 
 static int omap2430_musb_exit(struct musb *musb)
@@ -498,7 +477,6 @@ static int omap2430_probe(struct platform_device *pdev)
         struct omap2430_glue            *glue;
         struct device_node              *np = pdev->dev.of_node;
         struct musb_hdrc_config         *config;
-        struct resource                 *res;
         int                             ret = -ENOMEM;
 
         glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
@@ -521,12 +499,6 @@ static int omap2430_probe(struct platform_device *pdev)
         glue->musb                      = musb;
         glue->status                    = OMAP_MUSB_UNKNOWN;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-
-        glue->control_otghs = devm_request_and_ioremap(&pdev->dev, res);
-        if (glue->control_otghs == NULL)
-                dev_dbg(&pdev->dev, "Failed to obtain control memory\n");
-
         if (np) {
                 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
                 if (!pdata) {
@@ -556,11 +528,22 @@ static int omap2430_probe(struct platform_device *pdev)
                 of_property_read_u32(np, "ram_bits", (u32 *)&config->ram_bits);
                 of_property_read_u32(np, "power", (u32 *)&pdata->power);
                 config->multipoint = of_property_read_bool(np, "multipoint");
+                pdata->has_mailbox = of_property_read_bool(np,
+                    "ti,has-mailbox");
 
                 pdata->board_data       = data;
                 pdata->config           = config;
         }
 
+        if (pdata->has_mailbox) {
+                glue->control_otghs = omap_get_control_dev();
+                if (IS_ERR(glue->control_otghs)) {
+                        dev_vdbg(&pdev->dev, "Failed to get control device\n");
+                        return -ENODEV;
+                }
+        } else {
+                glue->control_otghs = ERR_PTR(-ENODEV);
+        }
         pdata->platform_ops             = &omap2430_ops;
 
         platform_set_drvdata(pdev, glue);