evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "USB: dwc3-msm: Enable power event irq in case of host bus suspend"

Browse source 
Commit 3dd2172dfecc ("USB: dwc3-msm: Enable power event irq in case of
host bus suspend") is added to enable power_event_irq during host bus
suspend. This is to map MPM pin for DM to power_event_irq to wakeup during
system suspend in host mode. Currently MPM driver has support for mapping
multiple MPM pins to single IRQ. Hence it is not required to enable
power_event_irq during host bus suspend.

Change-Id: I5c7d6b4d43baa0b387342a8bd261361a5c07fe23
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
This commit is contained in:
Vijayavardhan Vennapusa 2016-12-08 13:06:26 +05:30 • committed by Gerrit - the friendly Code Review server
parent 3162449f7d
commit 7d36ce0b84
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/usb/dwc3/dwc3-msm.c
View file

@ -2023,15 +2023,6 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc)
enable_irq_wake(mdwc->ss_phy_irq); enable_irq_wake(mdwc->ss_phy_irq);
enable_irq(mdwc->ss_phy_irq); enable_irq(mdwc->ss_phy_irq);
} }
/*
* Enable power event irq during bus suspend in host mode for
* mapping MPM pin for DP so that wakeup can happen in system
* suspend.
*/
if (mdwc->in_host_mode) {
enable_irq(mdwc->pwr_event_irq);
enable_irq_wake(mdwc->pwr_event_irq);
}
mdwc->lpm_flags |= MDWC3_ASYNC_IRQ_WAKE_CAPABILITY; mdwc->lpm_flags |= MDWC3_ASYNC_IRQ_WAKE_CAPABILITY;
} }
@ -2137,6 +2128,9 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc)
atomic_set(&dwc->in_lpm, 0); atomic_set(&dwc->in_lpm, 0);
/* enable power evt irq for IN P3 detection */
enable_irq(mdwc->pwr_event_irq);
/* Disable HSPHY auto suspend */ /* Disable HSPHY auto suspend */
dwc3_msm_write_reg(mdwc->base, DWC3_GUSB2PHYCFG(0), dwc3_msm_write_reg(mdwc->base, DWC3_GUSB2PHYCFG(0),
dwc3_msm_read_reg(mdwc->base, DWC3_GUSB2PHYCFG(0)) & dwc3_msm_read_reg(mdwc->base, DWC3_GUSB2PHYCFG(0)) &
@ -2151,18 +2145,11 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc)
disable_irq_wake(mdwc->ss_phy_irq); disable_irq_wake(mdwc->ss_phy_irq);
disable_irq_nosync(mdwc->ss_phy_irq); disable_irq_nosync(mdwc->ss_phy_irq);
} }
if (mdwc->in_host_mode) {
disable_irq_wake(mdwc->pwr_event_irq);
disable_irq(mdwc->pwr_event_irq);
}
mdwc->lpm_flags &= ~MDWC3_ASYNC_IRQ_WAKE_CAPABILITY; mdwc->lpm_flags &= ~MDWC3_ASYNC_IRQ_WAKE_CAPABILITY;
} }
dev_info(mdwc->dev, "DWC3 exited from low power mode\n"); dev_info(mdwc->dev, "DWC3 exited from low power mode\n");
/* enable power evt irq for IN P3 detection */
enable_irq(mdwc->pwr_event_irq);
/* Enable core irq */ /* Enable core irq */
if (dwc->irq) if (dwc->irq)
enable_irq(dwc->irq); enable_irq(dwc->irq);