MLK-20045-1 usb: chipidea: usbmisc_imx: using different .init for imx7ulp

imx7ulp uses different USB PHY with imx7d (MXS PHY vs PICO PHY), so the
features are supported by non-core register are a little different.
For example, autoresume feature is supported by all controllers for
imx7ulp, but for imx7d, it is only supported by non-HSIC controller.

Since imx7d has dedicated .init function, so the flag for imx7d PHY
(picophy) can be deleted.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 02857d1..fa3ca2a 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -492,7 +492,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
                data->usbmisc_data->anatop = data->anatop;
        }
 
-       data->usbmisc_data->picophy = (imx_platform_flag == &imx7d_usb_data);
        ret = imx_usbmisc_init(data->usbmisc_data);
        if (ret) {
                dev_err(dev, "usbmisc init failed, ret=%d\n", ret);

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h
index 584b376..6b72d64 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_imx.h
+++ b/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -27,7 +27,6 @@ struct imx_usbmisc_data {
        unsigned int evdo:1; /* set external vbus divider option */
        unsigned int ulpi:1; /* connected to an ULPI phy */
        unsigned int hsic:1; /* HSIC controlller */
-       unsigned int picophy:1; /* Samsung picophy */
        /*
         * Specifies the delay between powering up the xtal 24MHz clock
         * and release the clock to the digital logic inside the analog block

diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index ca9ba13..ae45a0b 100644 (file)
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -109,7 +109,7 @@
 #define MX7D_USBNC_USB_CTRL2_OPMODE_NON_DRIVING        MX7D_USBNC_USB_CTRL2_OPMODE(1)
 #define MX7D_USBNC_USB_CTRL2_TERMSEL_OVERRIDE_EN       BIT(5)
 #define MX7D_USBNC_USB_CTRL2_TERMSEL_OVERRIDE_VAL      BIT(4)
-#define MX7D_USBNC_HSIC_AUTO_RESUME    BIT(2)
+#define MX7D_USBNC_AUTO_RESUME                         BIT(2)
 
 #define MX7D_USB_VBUS_WAKEUP_SOURCE_MASK       0x3
 #define MX7D_USB_VBUS_WAKEUP_SOURCE(v)         (v << 0)
@@ -647,11 +647,6 @@ static int usbmisc_imx7d_init(struct imx_usbmisc_data *data)
        reg = readl(usbmisc->base);
        writel(reg | MX6_BM_NON_BURST_SETTING, usbmisc->base);
 
-       reg = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
-       reg &= ~MX7D_USB_VBUS_WAKEUP_SOURCE_MASK;
-       writel(reg | MX7D_USB_VBUS_WAKEUP_SOURCE_BVALID,
-                usbmisc->base + MX7D_USBNC_USB_CTRL2);
-
        if (data->hsic) {
                reg = readl(usbmisc->base);
                writel(reg | MX6_BM_UTMI_ON_CLOCK, usbmisc->base);
@@ -659,13 +654,13 @@ static int usbmisc_imx7d_init(struct imx_usbmisc_data *data)
                reg = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET);
                reg |= MX6_BM_HSIC_EN | MX6_BM_HSIC_CLK_ON;
                writel(reg, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET);
-
+       } else {
                reg = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
-               writel(reg | MX7D_USBNC_HSIC_AUTO_RESUME,
+               reg &= ~MX7D_USB_VBUS_WAKEUP_SOURCE_MASK;
+               writel(reg | MX7D_USB_VBUS_WAKEUP_SOURCE_BVALID
+                       | MX7D_USBNC_AUTO_RESUME,
                        usbmisc->base + MX7D_USBNC_USB_CTRL2);
-       }
-
-       if (data->picophy) {
+               /* PHY tuning for signal quality */
                reg = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG1);
                if (data->emp_curr_control && data->emp_curr_control <=
                        (TXPREEMPAMPTUNE0_MASK >> TXPREEMPAMPTUNE0_BIT)) {
@@ -930,6 +925,62 @@ static int usbmisc_term_select_override(struct imx_usbmisc_data *data,
        return 0;
 }
 
+static int usbmisc_imx7ulp_init(struct imx_usbmisc_data *data)
+{
+       struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev);
+       unsigned long flags;
+       u32 reg;
+
+       if (data->index >= 1)
+               return -EINVAL;
+
+       spin_lock_irqsave(&usbmisc->lock, flags);
+       reg = readl(usbmisc->base);
+       if (data->disable_oc) {
+               reg |= MX6_BM_OVER_CUR_DIS;
+       } else if (data->oc_polarity == 1) {
+               /* High active */
+               reg &= ~(MX6_BM_OVER_CUR_DIS | MX6_BM_OVER_CUR_POLARITY);
+       }
+
+       if (data->pwr_polarity)
+               reg |= MX6_BM_PRW_POLARITY;
+
+       writel(reg, usbmisc->base);
+
+       /* SoC non-burst setting */
+       reg = readl(usbmisc->base);
+       writel(reg | MX6_BM_NON_BURST_SETTING, usbmisc->base);
+
+       if (data->hsic) {
+               reg = readl(usbmisc->base);
+               writel(reg | MX6_BM_UTMI_ON_CLOCK, usbmisc->base);
+
+               reg = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET);
+               reg |= MX6_BM_HSIC_EN | MX6_BM_HSIC_CLK_ON;
+               writel(reg, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET);
+
+               /*
+                * For non-HSIC controller, the autoresume is enabled
+                * at MXS PHY driver (usbphy_ctrl bit18).
+                */
+               reg = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
+               writel(reg | MX7D_USBNC_AUTO_RESUME,
+                       usbmisc->base + MX7D_USBNC_USB_CTRL2);
+       } else {
+               reg = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
+               reg &= ~MX7D_USB_VBUS_WAKEUP_SOURCE_MASK;
+               writel(reg | MX7D_USB_VBUS_WAKEUP_SOURCE_BVALID,
+                        usbmisc->base + MX7D_USBNC_USB_CTRL2);
+       }
+
+       spin_unlock_irqrestore(&usbmisc->lock, flags);
+
+       usbmisc_imx7d_set_wakeup(data, false);
+
+       return 0;
+}
+
 static const struct usbmisc_ops imx25_usbmisc_ops = {
        .init = usbmisc_imx25_init,
        .post = usbmisc_imx25_post,
@@ -977,7 +1028,7 @@ static const struct usbmisc_ops imx7d_usbmisc_ops = {
 };
 
 static const struct usbmisc_ops imx7ulp_usbmisc_ops = {
-       .init = usbmisc_imx7d_init,
+       .init = usbmisc_imx7ulp_init,
        .set_wakeup = usbmisc_imx7d_set_wakeup,
        .power_lost_check = usbmisc_imx7d_power_lost_check,
        .hsic_set_connect = usbmisc_imx6_hsic_set_connect,