usb: chipidea: usbmisc: add post handling and errata fix for mx25

This adds a post handling routine which is called after
ci13xxx_add_device was called. The first user is the mx25, which has to
disable the external-vbus-divider after the udc has started.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
[Alex: also fixed a signed one-bit bitfield a whitespace error and yet
 another set of line-too-long and void pointer casting errors]
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 51 insertions, 0 deletions

diff --git a/drivers/usb/chipidea/ci13xxx_imx.c b/drivers/usb/chipidea/ci13xxx_imx.c
index 8c291220be7f..8faec9dbbb84 100644
--- a/drivers/usb/chipidea/ci13xxx_imx.c
+++ b/drivers/usb/chipidea/ci13xxx_imx.c
@@ -79,6 +79,9 @@ int usbmisc_get_init_data(struct device *dev, struct usbmisc_usb_device *usbdev)
         if (of_find_property(np, "disable-over-current", NULL))
                 usbdev->disable_oc = 1;
 
+        if (of_find_property(np, "external-vbus-divider", NULL))
+                usbdev->evdo = 1;
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(usbmisc_get_init_data);
@@ -202,6 +205,15 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
                 goto err;
         }
 
+        if (usbmisc_ops && usbmisc_ops->post) {
+                ret = usbmisc_ops->post(&pdev->dev);
+                if (ret) {
+                        dev_err(&pdev->dev,
+                                "usbmisc post failed, ret=%d\n", ret);
+                        goto put_np;
+                }
+        }
+
         data->ci_pdev = plat_ci;
         platform_set_drvdata(pdev, data);
 
diff --git a/drivers/usb/chipidea/ci13xxx_imx.h b/drivers/usb/chipidea/ci13xxx_imx.h
index 9cd2e910b1ca..550bfa457620 100644
--- a/drivers/usb/chipidea/ci13xxx_imx.h
+++ b/drivers/usb/chipidea/ci13xxx_imx.h
@@ -13,6 +13,8 @@
 struct usbmisc_ops {
         /* It's called once when probe a usb device */
         int (*init)(struct device *dev);
+        /* It's called once after adding a usb device */
+        int (*post)(struct device *dev);
 };
 
 struct usbmisc_usb_device {
@@ -20,6 +22,7 @@ struct usbmisc_usb_device {
         int index;
 
         unsigned int disable_oc:1; /* over current detect disabled */
+        unsigned int evdo:1; /* set external vbus divider option */
 };
 
 int usbmisc_set_ops(const struct usbmisc_ops *ops);
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 746013d7d391..714a6bd810ed 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -14,11 +14,15 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/delay.h>
 
 #include "ci13xxx_imx.h"
 
 #define USB_DEV_MAX 4
 
+#define MX25_USB_PHY_CTRL_OFFSET        0x08
+#define MX25_BM_EXTERNAL_VBUS_DIVIDER   BIT(23)
+
 #define MX53_USB_OTG_PHY_CTRL_0_OFFSET  0x08
 #define MX53_USB_UH2_CTRL_OFFSET        0x14
 #define MX53_USB_UH3_CTRL_OFFSET        0x18
@@ -59,6 +63,30 @@ static struct usbmisc_usb_device *get_usbdev(struct device *dev)
         return &usbmisc->usbdev[i];
 }
 
+static int usbmisc_imx25_post(struct device *dev)
+{
+        struct usbmisc_usb_device *usbdev;
+        void __iomem *reg;
+        unsigned long flags;
+        u32 val;
+
+        usbdev = get_usbdev(dev);
+        if (IS_ERR(usbdev))
+                return PTR_ERR(usbdev);
+
+        reg = usbmisc->base + MX25_USB_PHY_CTRL_OFFSET;
+
+        if (usbdev->evdo) {
+                spin_lock_irqsave(&usbmisc->lock, flags);
+                val = readl(reg);
+                writel(val | MX25_BM_EXTERNAL_VBUS_DIVIDER, reg);
+                spin_unlock_irqrestore(&usbmisc->lock, flags);
+                usleep_range(5000, 10000); /* needed to stabilize voltage */
+        }
+
+        return 0;
+}
+
 static int usbmisc_imx53_init(struct device *dev)
 {
         struct usbmisc_usb_device *usbdev;
@@ -120,6 +148,10 @@ static int usbmisc_imx6q_init(struct device *dev)
         return 0;
 }
 
+static const struct usbmisc_ops imx25_usbmisc_ops = {
+        .post = usbmisc_imx25_post,
+};
+
 static const struct usbmisc_ops imx53_usbmisc_ops = {
         .init = usbmisc_imx53_init,
 };
@@ -130,6 +162,10 @@ static const struct usbmisc_ops imx6q_usbmisc_ops = {
 
 static const struct of_device_id usbmisc_imx_dt_ids[] = {
         {
+                .compatible = "fsl,imx25-usbmisc",
+                .data = &imx25_usbmisc_ops,
+        },
+        {
                 .compatible = "fsl,imx53-usbmisc",
                 .data = &imx53_usbmisc_ops,
         },