Merge "dwc3_msm: Enable POWER EVENT IRQ as wakeup source" (f7cc0f70) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/dwc3/dwc3-msm.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -1521,9 +1521,6 @@ static void dwc3_msm_wake_interrupt_enable(struct dwc3_msm *mdwc, bool on)
		{
		u32 irq_mask;

		if (!mdwc->pwr_event_irq)
		return;

		if (on) {
		/* Enable P3 and L2 OUT events */
		irq_mask = dwc3_msm_read_reg(mdwc->base, PWR_EVNT_IRQ_MASK_REG);
		@@ -1668,7 +1665,10 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc)
		mdwc->qscratch_ctl_val);

		/* Enable wakeup from LPM */
		if (mdwc->pwr_event_irq) {
		dwc3_msm_wake_interrupt_enable(mdwc, true);
		enable_irq_wake(mdwc->pwr_event_irq);
		}

		/*
		* Marking in LPM before disabling the clocks in order to avoid a
		@@ -1876,7 +1876,10 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc)

		msm_bam_notify_lpm_resume(DWC3_CTRL);
		/* disable wakeup from LPM */
		if (mdwc->pwr_event_irq) {
		disable_irq_wake(mdwc->pwr_event_irq);
		dwc3_msm_wake_interrupt_enable(mdwc, false);
		}

		/* Disable HSPHY auto suspend */
		dwc3_msm_write_reg(mdwc->base, DWC3_GUSB2PHYCFG(0),