1 files changed, 16 insertions, 43 deletions

diff --git a/drivers/usb/otg/mxs-phy.c b/drivers/usb/otg/mxs-phy.c
index 88db976647cf..76302720055a 100644
--- a/drivers/usb/otg/mxs-phy.c
+++ b/drivers/usb/otg/mxs-phy.c
@@ -20,7 +20,6 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/workqueue.h>
 
 #define DRIVER_NAME "mxs_phy"
 
@@ -35,16 +34,9 @@
 #define BM_USBPHY_CTRL_ENUTMILEVEL2             BIT(14)
 #define BM_USBPHY_CTRL_ENHOSTDISCONDETECT       BIT(1)
 
-/*
- * Amount of delay in miliseconds to safely enable ENHOSTDISCONDETECT bit
- * so that connection and reset processing can be completed for the root hub.
- */
-#define MXY_PHY_ENHOSTDISCONDETECT_DELAY        250
-
 struct mxs_phy {
         struct usb_phy phy;
         struct clk *clk;
-        struct delayed_work enhostdiscondetect_work;
 };
 
 #define to_mxs_phy(p) container_of((p), struct mxs_phy, phy)
@@ -70,7 +62,6 @@ static int mxs_phy_init(struct usb_phy *phy)
 
         clk_prepare_enable(mxs_phy->clk);
         mxs_phy_hw_init(mxs_phy);
-        INIT_DELAYED_WORK(&mxs_phy->enhostdiscondetect_work, NULL);
 
         return 0;
 }
@@ -85,46 +76,28 @@ static void mxs_phy_shutdown(struct usb_phy *phy)
         clk_disable_unprepare(mxs_phy->clk);
 }
 
-static void mxs_phy_enhostdiscondetect_delay(struct work_struct *ws)
+static int mxs_phy_on_connect(struct usb_phy *phy,
+                enum usb_device_speed speed)
 {
-        struct mxs_phy *mxs_phy = container_of(ws, struct mxs_phy,
-                                                enhostdiscondetect_work.work);
-
-        /* Enable HOSTDISCONDETECT after delay. */
-        dev_dbg(mxs_phy->phy.dev, "Setting ENHOSTDISCONDETECT\n");
-        writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
-                                mxs_phy->phy.io_priv + HW_USBPHY_CTRL_SET);
-}
-
-static int mxs_phy_on_connect(struct usb_phy *phy, int port)
-{
-        struct mxs_phy *mxs_phy = to_mxs_phy(phy);
-
-        dev_dbg(phy->dev, "Connect on port %d\n", port);
-
-        mxs_phy_hw_init(mxs_phy);
+        dev_dbg(phy->dev, "%s speed device has connected\n",
+                (speed == USB_SPEED_HIGH) ? "high" : "non-high");
 
-        /*
-         * Delay enabling ENHOSTDISCONDETECT so that connection and
-         * reset processing can be completed for the root hub.
-         */
-        dev_dbg(phy->dev, "Delaying setting ENHOSTDISCONDETECT\n");
-        PREPARE_DELAYED_WORK(&mxs_phy->enhostdiscondetect_work,
-                        mxs_phy_enhostdiscondetect_delay);
-        schedule_delayed_work(&mxs_phy->enhostdiscondetect_work,
-                        msecs_to_jiffies(MXY_PHY_ENHOSTDISCONDETECT_DELAY));
+        if (speed == USB_SPEED_HIGH)
+                writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+                                phy->io_priv + HW_USBPHY_CTRL_SET);
 
         return 0;
 }
 
-static int mxs_phy_on_disconnect(struct usb_phy *phy, int port)
+static int mxs_phy_on_disconnect(struct usb_phy *phy,
+                enum usb_device_speed speed)
 {
-        dev_dbg(phy->dev, "Disconnect on port %d\n", port);
+        dev_dbg(phy->dev, "%s speed device has disconnected\n",
+                (speed == USB_SPEED_HIGH) ? "high" : "non-high");
 
-        /* No need to delay before clearing ENHOSTDISCONDETECT. */
-        dev_dbg(phy->dev, "Clearing ENHOSTDISCONDETECT\n");
-        writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
-                        phy->io_priv + HW_USBPHY_CTRL_CLR);
+        if (speed == USB_SPEED_HIGH)
+                writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+                                phy->io_priv + HW_USBPHY_CTRL_CLR);
 
         return 0;
 }
@@ -176,7 +149,7 @@ static int mxs_phy_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit mxs_phy_remove(struct platform_device *pdev)
+static int mxs_phy_remove(struct platform_device *pdev)
 {
         platform_set_drvdata(pdev, NULL);
 
@@ -191,7 +164,7 @@ MODULE_DEVICE_TABLE(of, mxs_phy_dt_ids);
 
 static struct platform_driver mxs_phy_driver = {
         .probe = mxs_phy_probe,
-        .remove = __devexit_p(mxs_phy_remove),
+        .remove = mxs_phy_remove,
         .driver = {
                 .name = DRIVER_NAME,
                 .owner  = THIS_MODULE,