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

Commit a4a3584f authored by Sriharsha Allenki's avatar Sriharsha Allenki
Browse files

usb: phy: Fix multiple regulator enable calls 



During the case of disconnect followed by a connect,
the current HS PHY driver enables the regulators during
init as well as resume resulting in multiple regulator
enable votes.
Fix this by enabling regulators only during resume.
While at it fix the incorrect debug log showing suspended
on both resume and suspend.

Change-Id: I0b4a2ab1d75208199b14099726d12d4880dfa0c6
Signed-off-by: default avatarSriharsha Allenki <sallenki@codeaurora.org>
parent b8816ebd

drivers/usb/phy/phy-qcom-snps-28nm-hs.c

+3 −5
Original line number Diff line number Diff line
@@ -348,10 +348,6 @@ static int msm_snps_hsphy_init(struct usb_phy *uphy) 
	int ret;



	dev_dbg(phy->phy.dev, "%s: Initialize HS PHY\n", __func__);

	ret = msm_snps_hsphy_enable_regulators(phy);

	if (ret)

		return ret;



	ret = msm_snps_phy_block_reset(phy);

	if (ret)

		return ret;
@@ -391,7 +387,8 @@ static int msm_snps_hsphy_set_suspend(struct usb_phy *uphy, int suspend) 
	dev_dbg(phy->phy.dev, "%s: suspend:%d with phy->suspended:%d\n",

					__func__, suspend, phy->suspended);

	if (phy->suspended == suspend) {

		dev_info(phy->phy.dev, "PHY is already suspended\n");

		dev_info(phy->phy.dev, "PHY is already %s\n",

					suspend ? "suspended" : "resumed");

		return 0;

	}
@@ -631,6 +628,7 @@ static int msm_snps_hsphy_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	phy->suspended = true;

	ret = usb_add_phy_dev(&phy->phy);



	return ret;