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

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

Merge "Revert "usb: dwc3-msm: Resume SS_PHY after enabling clocks""

parents dca99c82 301da258

drivers/usb/dwc3/dwc3-msm.c

+4 −7
Original line number Diff line number Diff line
@@ -1799,9 +1799,11 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc) 


	clk_prepare_enable(mdwc->utmi_clk);



	if (mdwc->lpm_flags & MDWC3_PHY_REF_CLK_OFF)

	if (mdwc->lpm_flags & MDWC3_PHY_REF_CLK_OFF) {

		clk_prepare_enable(mdwc->ref_clk);



		usb_phy_set_suspend(mdwc->ss_phy, 0);

		mdwc->lpm_flags &= ~MDWC3_PHY_REF_CLK_OFF;

	}

	usleep_range(1000, 1200);



	clk_prepare_enable(mdwc->iface_clk);
@@ -1810,11 +1812,6 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc) 
		mdwc->lpm_flags &= ~MDWC3_CORECLK_OFF;

	}



	if (mdwc->lpm_flags & MDWC3_PHY_REF_CLK_OFF) {

		usb_phy_set_suspend(mdwc->ss_phy, 0);

		mdwc->lpm_flags &= ~MDWC3_PHY_REF_CLK_OFF;

	}



	usb_phy_set_suspend(mdwc->hs_phy, 0);



	/* Recover from controller power collapse */