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

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

Merge "USB: phy-msm-qusb: Enable autoresume only when device is connected"

parents c2243bd4 2887b3f0

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

+8 −6
Original line number Original line Diff line number Diff line
@@ -1007,6 +1007,7 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend) 
			writel_relaxed(intr_mask,

			writel_relaxed(intr_mask,

				qphy->base + QUSB2PHY_PORT_INTR_CTRL);

				qphy->base + QUSB2PHY_PORT_INTR_CTRL);





			if (linestate & (LINESTATE_DP | LINESTATE_DM)) {

				/* enable phy auto-resume */

				/* enable phy auto-resume */

				writel_relaxed(0x0C,

				writel_relaxed(0x0C,

					qphy->base + QUSB2PHY_PORT_TEST_CTRL);

					qphy->base + QUSB2PHY_PORT_TEST_CTRL);
@@ -1014,6 +1015,7 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend) 
				wmb();

				wmb();

				writel_relaxed(0x04,

				writel_relaxed(0x04,

					qphy->base + QUSB2PHY_PORT_TEST_CTRL);

					qphy->base + QUSB2PHY_PORT_TEST_CTRL);

			}









			dev_dbg(phy->dev, "%s: intr_mask = %x\n",

			dev_dbg(phy->dev, "%s: intr_mask = %x\n",