2 files changed, 16 insertions, 10 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 8391538d688b..a815fd2cc5e7 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -4039,7 +4039,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
                 goto fail;
 
         if (hcd->phy && !hdev->parent)
-                usb_phy_notify_connect(hcd->phy, port1);
+                usb_phy_notify_connect(hcd->phy, udev->speed);
 
         /*
          * Some superspeed devices have finished the link training process
@@ -4238,7 +4238,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
         if (udev) {
                 if (hcd->phy && !hdev->parent &&
                                 !(portstatus & USB_PORT_STAT_CONNECTION))
-                        usb_phy_notify_disconnect(hcd->phy, port1);
+                        usb_phy_notify_disconnect(hcd->phy, udev->speed);
                 usb_disconnect(&hub->ports[port1 - 1]->child);
         }
         clear_bit(port1, hub->change_bits);
diff --git a/drivers/usb/otg/mxs-phy.c b/drivers/usb/otg/mxs-phy.c
index 5b09f3339ded..9a3caeecc508 100644
--- a/drivers/usb/otg/mxs-phy.c
+++ b/drivers/usb/otg/mxs-phy.c
@@ -76,22 +76,28 @@ static void mxs_phy_shutdown(struct usb_phy *phy)
         clk_disable_unprepare(mxs_phy->clk);
 }
 
-static int mxs_phy_on_connect(struct usb_phy *phy, int port)
+static int mxs_phy_on_connect(struct usb_phy *phy,
+                enum usb_device_speed speed)
 {
-        dev_dbg(phy->dev, "Connect on port %d\n", port);
+        dev_dbg(phy->dev, "%s speed device has connected\n",
+                (speed == USB_SPEED_HIGH) ? "high" : "non-high");
 
-        writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
-                        phy->io_priv + HW_USBPHY_CTRL_SET);
+        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");
 
-        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;
 }