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

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

Merge "usb: dwc3: Suspend USB SS PHY in host mode with device connect case"

parents f27d5677 c2e482aa

drivers/usb/dwc3/dwc3-msm.c

+1 −6
Original line number Diff line number Diff line
@@ -1996,7 +1996,6 @@ static void msm_dwc3_perf_vote_update(struct dwc3_msm *mdwc, 
static int dwc3_msm_suspend(struct dwc3_msm *mdwc)

{

	int ret, i;

	bool can_suspend_ssphy;

	struct dwc3 *dwc = platform_get_drvdata(mdwc->dwc3);



	dbg_event(0xFF, "Ctl Sus", atomic_read(&dwc->in_lpm));
@@ -2065,10 +2064,6 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc) 
		return ret;

	}



	/* Initialize variables here */

	can_suspend_ssphy = !(mdwc->in_host_mode &&

				dwc3_msm_is_host_superspeed(mdwc));



	/* Disable core irq */

	if (dwc->irq)

		disable_irq(dwc->irq);
@@ -2084,7 +2079,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc) 
	usb_phy_set_suspend(mdwc->hs_phy, 1);



	/* Suspend SS PHY */

	if (dwc->maximum_speed == USB_SPEED_SUPER && can_suspend_ssphy) {

	if (dwc->maximum_speed == USB_SPEED_SUPER) {

		/* indicate phy about SS mode */

		if (dwc3_msm_is_superspeed(mdwc))

			mdwc->ss_phy->flags |= DEVICE_IN_SS_MODE;