redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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)
5.4-rM2-2.2.x-imx-squashed
Li Jun 2017-04-12 05:41:21 +08:00 committed by Dong Aisheng
parent f72c32985f
commit b8f509e1fc
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/usb/phy/phy-mxs-usb.c
View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2012-2015 Freescale Semiconductor, Inc.
* Copyright 2012-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
* Copyright (C) 2012 Marek Vasut <marex@denx.de>
* on behalf of DENX Software Engineering GmbH
*/
@ -233,6 +234,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)
@ -430,18 +432,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;
@ -457,7 +447,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 != CUR_USB_MODE_HOST) ||
(last_event == USB_EVENT_VBUS)))
__mxs_phy_disconnect_line(mxs_phy, true);
else
@ -804,6 +794,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;
@ -907,6 +910,7 @@ static int mxs_phy_probe(struct platform_device *pdev)
mxs_phy->clk = clk;
mxs_phy->data = of_id->data;
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;