Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0de55d66 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update MPM pin mappings for USB for msmfalcon"

parents 652e5819 442026d9

arch/arm/boot/dts/qcom/msmfalcon-pm.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -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 */

			<0x5b 519>, /* lpass_pmu_tmr_timeout_irq_cx */

			<0xff 16>,  /* APC[0-7]_qgicQTmrHypPhysIrptReq */

drivers/usb/dwc3/dwc3-msm.c

+3 −16
Original line number Diff line number Diff line
@@ -2037,15 +2037,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;

	}
@@ -2151,6 +2142,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)) &
@@ -2165,18 +2159,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);