Merge "USB: phy-msm-qusb: Enable autoresume only when device is connected" (488f22ed) · Commits · e / devices / android_kernel_sony_msm8998

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

+8 −6

Original line number	Diff line number	Diff line
		@@ -730,6 +730,7 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend)
		writel_relaxed(intr_mask,
		qphy->base + QUSB2PHY_PORT_INTR_CTRL);

		if (linestate & (LINESTATE_DP \| LINESTATE_DM)) {
		/* enable phy auto-resume */
		writel_relaxed(0x0C,
		qphy->base + QUSB2PHY_PORT_TEST_CTRL);
		@@ -737,6 +738,7 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend)
		wmb();
		writel_relaxed(0x04,
		qphy->base + QUSB2PHY_PORT_TEST_CTRL);
		}


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