Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d16ec160 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: phy-msm-qusb: Re-initialize PHY after DCD detection"

parents c8dbbf23 ffb55e5e

drivers/usb/dwc3/dwc3-msm.c

+2 −1
Original line number Diff line number Diff line
@@ -3578,7 +3578,8 @@ static void dwc3_otg_sm_work(struct work_struct *w) 
					atomic_read(

						&mdwc->dev->power.usage_count));

				/* check dp/dm for SDP & runtime_put if !SDP */

				if (mdwc->detect_dpdm_floating) {

				if (mdwc->detect_dpdm_floating &&

				    mdwc->chg_type == DWC3_SDP_CHARGER) {

					dwc3_check_float_lines(mdwc);

					if (mdwc->chg_type != DWC3_SDP_CHARGER)

						break;

drivers/usb/phy/phy-msm-qusb.c

+3 −0
Original line number Diff line number Diff line
@@ -822,6 +822,9 @@ static int qusb_phy_linestate_with_idp_src(struct usb_phy *phy) 
	ret = (int_status >> 2) | ((int_status & 0x1) << 1);

	pr_debug("%s: int_status:%x, dpdm:%x\n", __func__, int_status, ret);



	/* Re-initialize PHY */

	qusb_phy_init(phy);



	return ret;

}