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

Commit 0fa3b9f9 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: qusb: Don't enable power rails until init() is called"

parents 91c41a87 b6521d40

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

+5 −4
Original line number Diff line number Diff line
@@ -142,10 +142,15 @@ disable_vdd: 
static int qusb_phy_init(struct usb_phy *phy)

{

	struct qusb_phy *qphy = container_of(phy, struct qusb_phy, phy);

	int ret;

	u32 t1, t2, t3, t4;



	dev_dbg(phy->dev, "%s\n", __func__);



	ret = qusb_phy_enable_power(qphy, true);

	if (ret)

		return ret;



	if (!qphy->clocks_enabled) {

		clk_prepare_enable(qphy->ref_clk);

		clk_prepare_enable(qphy->cfg_ahb_clk);
@@ -445,10 +450,6 @@ static int qusb_phy_probe(struct platform_device *pdev) 
		return PTR_ERR(qphy->vdda18);

	}



	ret = qusb_phy_enable_power(qphy, true);

	if (ret)

		return ret;



	platform_set_drvdata(pdev, qphy);



	qphy->phy.label			= "msm-qusb-phy";