MLK-14285-3 usb: phy: mxs: optimize disconnect line condition

We only have below cases to disconnect line when suspend:
1. Device mode without connection to any host/charger(no vbus).
2. Device mode connect to a charger(w/ vbus), usb suspend when
   system is entering suspend.
This patch can fix usb phy wrongly does disconnect line in case
some usb host enters suspend but vbus is off.

Signed-off-by: Li Jun <jun.li@nxp.com>
(cherry picked from commit 2af48913f77cec3658f5863b13f63619d8101279)

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 4b7f4bb..ae36fa4 100644 (file)
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2012-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  * Copyright (C) 2012 Marek Vasut <marex@denx.de>
  * on behalf of DENX Software Engineering GmbH
  *
@@ -217,6 +218,7 @@ struct mxs_phy {
        u32 tx_reg_mask;
        struct regulator *phy_3p0;
        bool hardware_control_phy2_clk;
+       enum usb_current_mode mode;
 };
 
 static inline bool is_imx6q_phy(struct mxs_phy *mxs_phy)
@@ -411,18 +413,6 @@ static void __mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool disconnect)
                usleep_range(500, 1000);
 }
 
-static bool mxs_phy_is_otg_host(struct mxs_phy *mxs_phy)
-{
-       void __iomem *base = mxs_phy->phy.io_priv;
-       u32 phyctrl = readl(base + HW_USBPHY_CTRL);
-
-       if (IS_ENABLED(CONFIG_USB_OTG) &&
-                       !(phyctrl & BM_USBPHY_CTRL_OTG_ID_VALUE))
-               return true;
-
-       return false;
-}
-
 static void mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool on)
 {
        bool vbus_is_on = false;
@@ -438,7 +428,7 @@ static void mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool on)
 
        vbus_is_on = mxs_phy_get_vbus_status(mxs_phy);
 
-       if (on && ((!vbus_is_on && !mxs_phy_is_otg_host(mxs_phy)) ||
+       if (on && ((!vbus_is_on && mxs_phy->mode != USB_MODE_HOST) ||
                        (last_event == USB_EVENT_VBUS)))
                __mxs_phy_disconnect_line(mxs_phy, true);
        else
@@ -641,6 +631,19 @@ static int mxs_phy_on_resume(struct usb_phy *phy,
        return 0;
 }
 
+/*
+ * Set the usb current role for phy.
+ */
+static int mxs_phy_set_mode(struct usb_phy *phy,
+               enum usb_current_mode mode)
+{
+       struct mxs_phy *mxs_phy = to_mxs_phy(phy);
+
+       mxs_phy->mode = mode;
+
+       return 0;
+}
+
 static int mxs_phy_probe(struct platform_device *pdev)
 {
        struct resource *res;
@@ -731,6 +734,7 @@ static int mxs_phy_probe(struct platform_device *pdev)
        mxs_phy->phy.notify_disconnect  = mxs_phy_on_disconnect;
        mxs_phy->phy.type               = USB_PHY_TYPE_USB2;
        mxs_phy->phy.set_wakeup         = mxs_phy_set_wakeup;
+       mxs_phy->phy.set_mode           = mxs_phy_set_mode;
        if (mxs_phy->data->flags & MXS_PHY_SENDING_SOF_TOO_FAST) {
                mxs_phy->phy.notify_suspend = mxs_phy_on_suspend;
                mxs_phy->phy.notify_resume = mxs_phy_on_resume;