Merge "usb: dwc3: Suspend USB SS PHY in host mode with device connect case" (e67a6b6d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/dwc3/dwc3-msm.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -2144,7 +2144,6 @@ static void configure_nonpdc_usb_interrupt(struct dwc3_msm *mdwc,
		static int dwc3_msm_suspend(struct dwc3_msm *mdwc)
		{
		int ret;
		bool can_suspend_ssphy;
		struct dwc3 *dwc = platform_get_drvdata(mdwc->dwc3);
		struct dwc3_event_buffer *evt;
		struct usb_irq *uirq;
		@@ -2201,10 +2200,6 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc)
		if (ret)
		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);
		@@ -2220,7 +2215,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;