From 7d36ce0b842ec10b6c366fb08ee9c67dcfd6e441 Mon Sep 17 00:00:00 2001 From: Vijayavardhan Vennapusa Date: Thu, 8 Dec 2016 13:06:26 +0530 Subject: [PATCH 1/2] 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 --- drivers/usb/dwc3/dwc3-msm.c | 19 +++---------------- 1 file 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); From 442026d9906d734125c48253790d137b94f2cd99 Mon Sep 17 00:00:00 2001 From: Vijayavardhan Vennapusa Date: Thu, 8 Dec 2016 13:49:15 +0530 Subject: [PATCH 2/2] ARM: dts: msm: Update MPM pin mappings for USB for msmfalcon Update required MPM pin mappings for USB for msmfalcon for remote wakeup to be working during system suspend. Change-Id: I26893b0d5974e8aff3c2ed7147560ba113af0155 Signed-off-by: Vijayavardhan Vennapusa --- arch/arm/boot/dts/qcom/msmfalcon-pm.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom/msmfalcon-pm.dtsi b/arch/arm/boot/dts/qcom/msmfalcon-pm.dtsi index 39c766613b30..1b8b22442c35 100644 --- a/arch/arm/boot/dts/qcom/msmfalcon-pm.dtsi +++ b/arch/arm/boot/dts/qcom/msmfalcon-pm.dtsi @@ -340,9 +340,9 @@ qcom,gic-parent = <&intc>; qcom,gic-map = <0x02 216>, /* tsens1_tsens_upper_lower_int */ - <0x31 212>, /* usb30_power_event_irq */ <0x34 275>, /* qmp_usb3_lfps_rxterm_irq_cx */ <0x4f 379>, /* qusb2phy_intr */ + <0x51 379>, /* qusb2phy_intr */ <0x57 358>, /* ee0_apps_hlos_spmi_periph_irq */ <0xff 16>, /* APC[0-7]_qgicQTmrHypPhysIrptReq */ <0xff 17>, /* APC[0-7]_qgicQTmrSecPhysIrptReq */