1 files changed, 69 insertions, 104 deletions

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 3dbb4a21ab44..79ad8e91632e 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -62,7 +62,6 @@
 #include <linux/usb/chipidea.h>
 #include <linux/usb/of.h>
 #include <linux/of.h>
-#include <linux/phy.h>
 #include <linux/regulator/consumer.h>
 #include <linux/usb/ehci_def.h>
 
@@ -86,6 +85,7 @@ static const u8 ci_regs_nolpm[] = {
         [OP_ENDPTLISTADDR]      = 0x18U,
         [OP_TTCTRL]             = 0x1CU,
         [OP_BURSTSIZE]          = 0x20U,
+        [OP_ULPI_VIEWPORT]      = 0x30U,
         [OP_PORTSC]             = 0x44U,
         [OP_DEVLC]              = 0x84U,
         [OP_OTGSC]              = 0x64U,
@@ -110,6 +110,7 @@ static const u8 ci_regs_lpm[] = {
         [OP_ENDPTLISTADDR]      = 0x18U,
         [OP_TTCTRL]             = 0x1CU,
         [OP_BURSTSIZE]          = 0x20U,
+        [OP_ULPI_VIEWPORT]      = 0x30U,
         [OP_PORTSC]             = 0x44U,
         [OP_DEVLC]              = 0x84U,
         [OP_OTGSC]              = 0xC4U,
@@ -285,7 +286,7 @@ static int hw_device_init(struct ci_hdrc *ci, void __iomem *base)
         return 0;
 }
 
-static void hw_phymode_configure(struct ci_hdrc *ci)
+void hw_phymode_configure(struct ci_hdrc *ci)
 {
         u32 portsc, lpm, sts = 0;
 
@@ -325,6 +326,7 @@ static void hw_phymode_configure(struct ci_hdrc *ci)
                         hw_write(ci, OP_PORTSC, PORTSC_STS, PORTSC_STS);
         }
 }
+EXPORT_SYMBOL_GPL(hw_phymode_configure);
 
 /**
  * _ci_usb_phy_init: initialize phy taking in account both phy and usb_phy
@@ -361,6 +363,9 @@ static int _ci_usb_phy_init(struct ci_hdrc *ci)
  */
 static void ci_usb_phy_exit(struct ci_hdrc *ci)
 {
+        if (ci->platdata->flags & CI_HDRC_OVERRIDE_PHY_CONTROL)
+                return;
+
         if (ci->phy) {
                 phy_power_off(ci->phy);
                 phy_exit(ci->phy);
@@ -379,6 +384,9 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
 {
         int ret;
 
+        if (ci->platdata->flags & CI_HDRC_OVERRIDE_PHY_CONTROL)
+                return 0;
+
         switch (ci->platdata->phy_mode) {
         case USBPHY_INTERFACE_MODE_UTMI:
         case USBPHY_INTERFACE_MODE_UTMIW:
@@ -419,13 +427,21 @@ void ci_platform_configure(struct ci_hdrc *ci)
         is_device_mode = hw_read(ci, OP_USBMODE, USBMODE_CM) == USBMODE_CM_DC;
         is_host_mode = hw_read(ci, OP_USBMODE, USBMODE_CM) == USBMODE_CM_HC;
 
-        if (is_device_mode &&
-                (ci->platdata->flags & CI_HDRC_DISABLE_DEVICE_STREAMING))
-                hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);
+        if (is_device_mode) {
+                phy_set_mode(ci->phy, PHY_MODE_USB_DEVICE);
+
+                if (ci->platdata->flags & CI_HDRC_DISABLE_DEVICE_STREAMING)
+                        hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS,
+                                 USBMODE_CI_SDIS);
+        }
+
+        if (is_host_mode) {
+                phy_set_mode(ci->phy, PHY_MODE_USB_HOST);
 
-        if (is_host_mode &&
-                (ci->platdata->flags & CI_HDRC_DISABLE_HOST_STREAMING))
-                hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);
+                if (ci->platdata->flags & CI_HDRC_DISABLE_HOST_STREAMING)
+                        hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS,
+                                 USBMODE_CI_SDIS);
+        }
 
         if (ci->platdata->flags & CI_HDRC_FORCE_FULLSPEED) {
                 if (ci->hw_bank.lpm)
@@ -495,9 +511,12 @@ int hw_device_reset(struct ci_hdrc *ci)
                 return ret;
         }
 
-        if (ci->platdata->notify_event)
-                ci->platdata->notify_event(ci,
+        if (ci->platdata->notify_event) {
+                ret = ci->platdata->notify_event(ci,
                         CI_HDRC_CONTROLLER_RESET_EVENT);
+                if (ret)
+                        return ret;
+        }
 
         /* USBMODE should be configured step by step */
         hw_write(ci, OP_USBMODE, USBMODE_CM, USBMODE_CM_IDLE);
@@ -516,38 +535,6 @@ int hw_device_reset(struct ci_hdrc *ci)
         return 0;
 }
 
-/**
- * hw_wait_reg: wait the register value
- *
- * Sometimes, it needs to wait register value before going on.
- * Eg, when switch to device mode, the vbus value should be lower
- * than OTGSC_BSV before connects to host.
- *
- * @ci: the controller
- * @reg: register index
- * @mask: mast bit
- * @value: the bit value to wait
- * @timeout_ms: timeout in millisecond
- *
- * This function returns an error code if timeout
- */
-int hw_wait_reg(struct ci_hdrc *ci, enum ci_hw_regs reg, u32 mask,
-                                u32 value, unsigned int timeout_ms)
-{
-        unsigned long elapse = jiffies + msecs_to_jiffies(timeout_ms);
-
-        while (hw_read(ci, reg, mask) != value) {
-                if (time_after(jiffies, elapse)) {
-                        dev_err(ci->dev, "timeout waiting for %08x in %d\n",
-                                        mask, reg);
-                        return -ETIMEDOUT;
-                }
-                msleep(20);
-        }
-
-        return 0;
-}
-
 static irqreturn_t ci_irq(int irq, void *data)
 {
         struct ci_hdrc *ci = data;
@@ -601,35 +588,14 @@ static irqreturn_t ci_irq(int irq, void *data)
         return ret;
 }
 
-static int ci_vbus_notifier(struct notifier_block *nb, unsigned long event,
-                            void *ptr)
-{
-        struct ci_hdrc_cable *vbus = container_of(nb, struct ci_hdrc_cable, nb);
-        struct ci_hdrc *ci = vbus->ci;
-
-        if (event)
-                vbus->state = true;
-        else
-                vbus->state = false;
-
-        vbus->changed = true;
-
-        ci_irq(ci->irq, ci);
-        return NOTIFY_DONE;
-}
-
-static int ci_id_notifier(struct notifier_block *nb, unsigned long event,
-                          void *ptr)
+static int ci_cable_notifier(struct notifier_block *nb, unsigned long event,
+                             void *ptr)
 {
-        struct ci_hdrc_cable *id = container_of(nb, struct ci_hdrc_cable, nb);
-        struct ci_hdrc *ci = id->ci;
+        struct ci_hdrc_cable *cbl = container_of(nb, struct ci_hdrc_cable, nb);
+        struct ci_hdrc *ci = cbl->ci;
 
-        if (event)
-                id->state = false;
-        else
-                id->state = true;
-
-        id->changed = true;
+        cbl->connected = event;
+        cbl->changed = true;
 
         ci_irq(ci->irq, ci);
         return NOTIFY_DONE;
@@ -738,27 +704,27 @@ static int ci_get_platdata(struct device *dev,
         }
 
         cable = &platdata->vbus_extcon;
-        cable->nb.notifier_call = ci_vbus_notifier;
+        cable->nb.notifier_call = ci_cable_notifier;
         cable->edev = ext_vbus;
 
         if (!IS_ERR(ext_vbus)) {
-                ret = extcon_get_cable_state_(cable->edev, EXTCON_USB);
+                ret = extcon_get_state(cable->edev, EXTCON_USB);
                 if (ret)
-                        cable->state = true;
+                        cable->connected = true;
                 else
-                        cable->state = false;
+                        cable->connected = false;
         }
 
         cable = &platdata->id_extcon;
-        cable->nb.notifier_call = ci_id_notifier;
+        cable->nb.notifier_call = ci_cable_notifier;
         cable->edev = ext_id;
 
         if (!IS_ERR(ext_id)) {
-                ret = extcon_get_cable_state_(cable->edev, EXTCON_USB_HOST);
+                ret = extcon_get_state(cable->edev, EXTCON_USB_HOST);
                 if (ret)
-                        cable->state = false;
+                        cable->connected = true;
                 else
-                        cable->state = true;
+                        cable->connected = false;
         }
         return 0;
 }
@@ -771,8 +737,8 @@ static int ci_extcon_register(struct ci_hdrc *ci)
         id = &ci->platdata->id_extcon;
         id->ci = ci;
         if (!IS_ERR(id->edev)) {
-                ret = extcon_register_notifier(id->edev, EXTCON_USB_HOST,
-                                               &id->nb);
+                ret = devm_extcon_register_notifier(ci->dev, id->edev,
+                                                EXTCON_USB_HOST, &id->nb);
                 if (ret < 0) {
                         dev_err(ci->dev, "register ID failed\n");
                         return ret;
@@ -782,11 +748,9 @@ static int ci_extcon_register(struct ci_hdrc *ci)
         vbus = &ci->platdata->vbus_extcon;
         vbus->ci = ci;
         if (!IS_ERR(vbus->edev)) {
-                ret = extcon_register_notifier(vbus->edev, EXTCON_USB,
-                                               &vbus->nb);
+                ret = devm_extcon_register_notifier(ci->dev, vbus->edev,
+                                                EXTCON_USB, &vbus->nb);
                 if (ret < 0) {
-                        extcon_unregister_notifier(id->edev, EXTCON_USB_HOST,
-                                                   &id->nb);
                         dev_err(ci->dev, "register VBUS failed\n");
                         return ret;
                 }
@@ -795,20 +759,6 @@ static int ci_extcon_register(struct ci_hdrc *ci)
         return 0;
 }
 
-static void ci_extcon_unregister(struct ci_hdrc *ci)
-{
-        struct ci_hdrc_cable *cable;
-
-        cable = &ci->platdata->id_extcon;
-        if (!IS_ERR(cable->edev))
-                extcon_unregister_notifier(cable->edev, EXTCON_USB_HOST,
-                                           &cable->nb);
-
-        cable = &ci->platdata->vbus_extcon;
-        if (!IS_ERR(cable->edev))
-                extcon_unregister_notifier(cable->edev, EXTCON_USB, &cable->nb);
-}
-
 static DEFINE_IDA(ci_ida);
 
 struct platform_device *ci_hdrc_add_device(struct device *dev,
@@ -921,6 +871,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
                 CI_HDRC_IMX28_WRITE_FIX);
         ci->supports_runtime_pm = !!(ci->platdata->flags &
                 CI_HDRC_SUPPORTS_RUNTIME_PM);
+        platform_set_drvdata(pdev, ci);
 
         ret = hw_device_init(ci, base);
         if (ret < 0) {
@@ -928,6 +879,10 @@ static int ci_hdrc_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
+        ret = ci_ulpi_init(ci);
+        if (ret)
+                return ret;
+
         if (ci->platdata->phy) {
                 ci->phy = ci->platdata->phy;
         } else if (ci->platdata->usb_phy) {
@@ -938,11 +893,15 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 
                 /* if both generic PHY and USB PHY layers aren't enabled */
                 if (PTR_ERR(ci->phy) == -ENOSYS &&
-                                PTR_ERR(ci->usb_phy) == -ENXIO)
-                        return -ENXIO;
+                                PTR_ERR(ci->usb_phy) == -ENXIO) {
+                        ret = -ENXIO;
+                        goto ulpi_exit;
+                }
 
-                if (IS_ERR(ci->phy) && IS_ERR(ci->usb_phy))
-                        return -EPROBE_DEFER;
+                if (IS_ERR(ci->phy) && IS_ERR(ci->usb_phy)) {
+                        ret = -EPROBE_DEFER;
+                        goto ulpi_exit;
+                }
 
                 if (IS_ERR(ci->phy))
                         ci->phy = NULL;
@@ -1027,7 +986,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
                 }
         }
 
-        platform_set_drvdata(pdev, ci);
         ret = devm_request_irq(dev, ci->irq, ci_irq, IRQF_SHARED,
                         ci->platdata->name, ci);
         if (ret)
@@ -1054,11 +1012,12 @@ static int ci_hdrc_probe(struct platform_device *pdev)
         if (!ret)
                 return 0;
 
-        ci_extcon_unregister(ci);
 stop:
         ci_role_destroy(ci);
 deinit_phy:
         ci_usb_phy_exit(ci);
+ulpi_exit:
+        ci_ulpi_exit(ci);
 
         return ret;
 }
@@ -1074,10 +1033,10 @@ static int ci_hdrc_remove(struct platform_device *pdev)
         }
 
         dbg_remove_files(ci);
-        ci_extcon_unregister(ci);
         ci_role_destroy(ci);
         ci_hdrc_enter_lpm(ci, true);
         ci_usb_phy_exit(ci);
+        ci_ulpi_exit(ci);
 
         return 0;
 }
@@ -1125,6 +1084,7 @@ static void ci_controller_suspend(struct ci_hdrc *ci)
 static int ci_controller_resume(struct device *dev)
 {
         struct ci_hdrc *ci = dev_get_drvdata(dev);
+        int ret;
 
         dev_dbg(dev, "at %s\n", __func__);
 
@@ -1134,6 +1094,11 @@ static int ci_controller_resume(struct device *dev)
         }
 
         ci_hdrc_enter_lpm(ci, false);
+
+        ret = ci_ulpi_resume(ci);
+        if (ret)
+                return ret;
+
         if (ci->usb_phy) {
                 usb_phy_set_suspend(ci->usb_phy, 0);
                 usb_phy_set_wakeup(ci->usb_phy, false);