Merge "usb: phy: qmp: Select usb3 phy mode during PHY reset" into msm-4.9 (0c95b2e2) · Commits · e / devices / android_kernel_fairphone_FP3

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

+5 −5

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -304,10 +304,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]);

		@@ -383,6 +379,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) {