1 files changed, 19 insertions, 6 deletions

diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index 371478704899..4cf77d3c3bd2 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -363,6 +363,7 @@ static void usbhsc_hotplug(struct usbhs_priv *priv)
         struct usbhs_mod *mod = usbhs_mod_get_current(priv);
         int id;
         int enable;
+        int cable;
         int ret;
 
         /*
@@ -376,6 +377,16 @@ static void usbhsc_hotplug(struct usbhs_priv *priv)
         id = usbhs_platform_call(priv, get_id, pdev);
 
         if (enable && !mod) {
+                if (priv->edev) {
+                        cable = extcon_get_cable_state(priv->edev, "USB-HOST");
+                        if ((cable > 0 && id != USBHS_HOST) ||
+                            (!cable && id != USBHS_GADGET)) {
+                                dev_info(&pdev->dev,
+                                         "USB cable plugged in doesn't match the selected role!\n");
+                                return;
+                        }
+                }
+
                 ret = usbhs_mod_change(priv, id);
                 if (ret < 0)
                         return;
@@ -514,6 +525,12 @@ static int usbhs_probe(struct platform_device *pdev)
         if (IS_ERR(priv->base))
                 return PTR_ERR(priv->base);
 
+        if (of_property_read_bool(pdev->dev.of_node, "extcon")) {
+                priv->edev = extcon_get_edev_by_phandle(&pdev->dev, 0);
+                if (IS_ERR(priv->edev))
+                        return PTR_ERR(priv->edev);
+        }
+
         /*
          * care platform info
          */
@@ -615,7 +632,7 @@ static int usbhs_probe(struct platform_device *pdev)
          */
         ret = usbhs_platform_call(priv, hardware_init, pdev);
         if (ret < 0) {
-                dev_err(&pdev->dev, "platform prove failed.\n");
+                dev_err(&pdev->dev, "platform init failed.\n");
                 goto probe_end_mod_exit;
         }
 
@@ -632,16 +649,12 @@ static int usbhs_probe(struct platform_device *pdev)
         /*
          * manual call notify_hotplug for cold plug
          */
-        ret = usbhsc_drvcllbck_notify_hotplug(pdev);
-        if (ret < 0)
-                goto probe_end_call_remove;
+        usbhsc_drvcllbck_notify_hotplug(pdev);
 
         dev_info(&pdev->dev, "probed\n");
 
         return ret;
 
-probe_end_call_remove:
-        usbhs_platform_call(priv, hardware_exit, pdev);
 probe_end_mod_exit:
         usbhs_mod_remove(priv);
 probe_end_fifo_exit: