Merge "usb: dwc3: handshake between dwc3 and usb_bam for lpm" (1500db02) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/dwc3/dwc3-msm.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1402,6 +1402,13 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc)
		}
		}

		if (!msm_bam_usb_lpm_ok(DWC3_CTRL)) {
		dev_dbg(mdwc->dev,
		"%s: IPA handshake not finished, will suspend when done\n",
		__func__);
		return -EBUSY;
		}

		host_ss_active = dwc3_msm_read_reg(mdwc->base, USB3_PORTSC) & PORT_PE;
		if (mdwc->hs_phy_irq)
		disable_irq(mdwc->hs_phy_irq);
		@@ -1569,6 +1576,8 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc)
		usb_phy_set_suspend(mdwc->ss_phy, 0);
		atomic_set(&mdwc->in_lpm, 0);

		msm_bam_notify_lpm_resume(DWC3_CTRL);

		/* match disable_irq call from isr */
		if (mdwc->lpm_irq_seen && mdwc->hs_phy_irq) {
		enable_irq(mdwc->hs_phy_irq);