Merge "usb: phy: qmp: Do not reset phy mode in DP+USB concurrent mode" (93081f59) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/usb/phy/phy-msm-ssusb-qmp.c

+4 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -724,7 +724,9 @@ static int msm_ssphy_qmp_set_suspend(struct usb_phy *uphy, int suspend)
		if (phy->cable_connected) {
		msm_ssusb_qmp_enable_autonomous(phy, 1);
		} else {
		if (uphy->type == USB_PHY_TYPE_USB3_AND_DP)
		/* Reset phy mode to USB only if DP not connected */
		if (uphy->type == USB_PHY_TYPE_USB3_AND_DP &&
		!(phy->phy.flags & PHY_USB_DP_CONCURRENT_MODE))
		msm_ssphy_qmp_setmode(phy, USB3_MODE);
		writel_relaxed(0x00,
		phy->base + phy->phy_reg[USB3_PHY_POWER_DOWN_CONTROL]);