Merge tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[firefly-linux-kernel-4.4.55.git] / drivers / usb / chipidea / usbmisc_imx.c

diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index fd4d3392125f43e551881258f5cdb8391d249417..714a6bd810ede0de96b28d3523bed2baa703f1de 100644 (file)
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -14,18 +14,30 @@
 #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 BM_OVER_CUR_DIS                BIT(7)
+#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
+#define MX53_BM_OVER_CUR_DIS_H1                BIT(5)
+#define MX53_BM_OVER_CUR_DIS_OTG       BIT(8)
+#define MX53_BM_OVER_CUR_DIS_UHx       BIT(30)
+
+#define MX6_BM_OVER_CUR_DIS            BIT(7)
 
 struct imx_usbmisc {
        void __iomem *base;
        spinlock_t lock;
        struct clk *clk;
        struct usbmisc_usb_device usbdev[USB_DEV_MAX];
+       const struct usbmisc_ops *ops;
 };
 
 static struct imx_usbmisc *usbmisc;
@@ -51,6 +63,69 @@ 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;
+       void __iomem *reg = NULL;
+       unsigned long flags;
+       u32 val = 0;
+
+       usbdev = get_usbdev(dev);
+       if (IS_ERR(usbdev))
+               return PTR_ERR(usbdev);
+
+       if (usbdev->disable_oc) {
+               spin_lock_irqsave(&usbmisc->lock, flags);
+               switch (usbdev->index) {
+               case 0:
+                       reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
+                       val = readl(reg) | MX53_BM_OVER_CUR_DIS_OTG;
+                       break;
+               case 1:
+                       reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
+                       val = readl(reg) | MX53_BM_OVER_CUR_DIS_H1;
+                       break;
+               case 2:
+                       reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET;
+                       val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
+                       break;
+               case 3:
+                       reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET;
+                       val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
+                       break;
+               }
+               if (reg && val)
+                       writel(val, reg);
+               spin_unlock_irqrestore(&usbmisc->lock, flags);
+       }
+
+       return 0;
+}
+
 static int usbmisc_imx6q_init(struct device *dev)
 {
 
@@ -65,7 +140,7 @@ static int usbmisc_imx6q_init(struct device *dev)
        if (usbdev->disable_oc) {
                spin_lock_irqsave(&usbmisc->lock, flags);
                reg = readl(usbmisc->base + usbdev->index * 4);
-               writel(reg | BM_OVER_CUR_DIS,
+               writel(reg | MX6_BM_OVER_CUR_DIS,
                        usbmisc->base + usbdev->index * 4);
                spin_unlock_irqrestore(&usbmisc->lock, flags);
        }
@@ -73,12 +148,31 @@ 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,
+};
+
 static const struct usbmisc_ops imx6q_usbmisc_ops = {
        .init = usbmisc_imx6q_init,
 };
 
 static const struct of_device_id usbmisc_imx_dt_ids[] = {
-       { .compatible = "fsl,imx6q-usbmisc"},
+       {
+               .compatible = "fsl,imx25-usbmisc",
+               .data = &imx25_usbmisc_ops,
+       },
+       {
+               .compatible = "fsl,imx53-usbmisc",
+               .data = &imx53_usbmisc_ops,
+       },
+       {
+               .compatible = "fsl,imx6q-usbmisc",
+               .data = &imx6q_usbmisc_ops,
+       },
        { /* sentinel */ }
 };
 
@@ -87,6 +181,7 @@ static int usbmisc_imx_probe(struct platform_device *pdev)
        struct resource *res;
        struct imx_usbmisc *data;
        int ret;
+       struct of_device_id *tmp_dev;
 
        if (usbmisc)
                return -EBUSY;
@@ -116,20 +211,23 @@ static int usbmisc_imx_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = usbmisc_set_ops(&imx6q_usbmisc_ops);
+       tmp_dev = (struct of_device_id *)
+               of_match_device(usbmisc_imx_dt_ids, &pdev->dev);
+       data->ops = (const struct usbmisc_ops *)tmp_dev->data;
+       usbmisc = data;
+       ret = usbmisc_set_ops(data->ops);
        if (ret) {
+               usbmisc = NULL;
                clk_disable_unprepare(data->clk);
                return ret;
        }
 
-       usbmisc = data;
-
        return 0;
 }
 
 static int usbmisc_imx_remove(struct platform_device *pdev)
 {
-       usbmisc_unset_ops(&imx6q_usbmisc_ops);
+       usbmisc_unset_ops(usbmisc->ops);
        clk_disable_unprepare(usbmisc->clk);
        usbmisc = NULL;
        return 0;