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

Commit ae8cc320 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: Enable autosuspend delay for msm8909 USB"

parents d042e374 e6d1c856

arch/arm64/boot/dts/qcom/msm8909.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -839,6 +839,7 @@ 
		qcom,hsusb-otg-otg-control = <2>; /* PMIC */

		qcom,dp-manual-pullup;

		qcom,phy-dvdd-always-on;

		qcom,hsusb-otg-delay-lpm;

		qcom,hsusb-otg-mpm-dpsehv-int = <49>;

		qcom,hsusb-otg-mpm-dmsehv-int = <58>;

drivers/usb/phy/phy-msm-usb.c

+4 −0
Original line number Diff line number Diff line
@@ -1689,6 +1689,8 @@ static int msm_otg_resume(struct msm_otg *motg) 
	}



	disable_irq(motg->irq);

	if (motg->phy_irq)

		disable_irq(motg->phy_irq);

	pm_stay_awake(&motg->pdev->dev);



	/*
@@ -1807,6 +1809,8 @@ static int msm_otg_resume(struct msm_otg *motg) 
		enable_irq(motg->async_int);

		motg->async_int = 0;

	}

	if (motg->phy_irq)

		enable_irq(motg->phy_irq);

	enable_irq(motg->irq);



	/* Enable ASYNC_IRQ only during LPM */