diff options
| author | Vijayavardhan Vennapusa <vvreddy@codeaurora.org> | 2016-12-08 13:06:26 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-13 20:55:37 -0800 |
| commit | 7d36ce0b842ec10b6c366fb08ee9c67dcfd6e441 (patch) | |
| tree | 7d16ecbd8757fe9402e943de51cbe49107bfa439 | |
| parent | 3162449f7d245d45f007d4ea3224576ddf1bcc63 (diff) | |
Revert "USB: dwc3-msm: Enable power event irq in case of host bus suspend"
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>
| -rw-r--r-- | drivers/usb/dwc3/dwc3-msm.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c index 15c994294c63..212f0532fb58 100644 --- a/drivers/usb/dwc3/dwc3-msm.c +++ b/drivers/usb/dwc3/dwc3-msm.c @@ -2023,15 +2023,6 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc) enable_irq_wake(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; } @@ -2137,6 +2128,9 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc) atomic_set(&dwc->in_lpm, 0); + /* enable power evt irq for IN P3 detection */ + enable_irq(mdwc->pwr_event_irq); + /* Disable HSPHY auto suspend */ dwc3_msm_write_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_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; } 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 */ if (dwc->irq) enable_irq(dwc->irq); |