Merge "usb: phy: qmp: Select usb3 phy mode during PHY reset" (a92ee0d3) · Commits · e / devices / android_kernel_sony_msm8998

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -330,10 +330,6 @@ static int msm_ssphy_qmp_init(struct usb_phy *uphy)
		phy->clk_enabled = true;
		}

		/* select usb3 phy mode */
		if (phy->tcsr_usb3_dp_phymode)
		writel_relaxed(0x0, phy->tcsr_usb3_dp_phymode);

		writel_relaxed(0x01,
		phy->base + phy->phy_reg[USB3_PHY_POWER_DOWN_CONTROL]);

		@@ -409,6 +405,10 @@ static int msm_ssphy_qmp_reset(struct usb_phy *uphy)
		goto deassert_phy_phy_reset;
		}

		/* select usb3 phy mode */
		if (phy->tcsr_usb3_dp_phymode)
		writel_relaxed(0x0, phy->tcsr_usb3_dp_phymode);

		/* Deassert USB3 PHY CSR reset */
		ret = reset_control_deassert(phy->phy_reset);
		if (ret) {