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

Commit a4c904f9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: msm_otg: Print warning message when not able to turn USB CLKs"

parents 146a7f0e e92c0d35

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

+8 −4
Original line number Diff line number Diff line
@@ -457,8 +457,10 @@ static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert) 
			dev_dbg(motg->phy.dev, "block_reset DEASSERT\n");

			ret = clk_reset(motg->core_clk, CLK_RESET_DEASSERT);

			ndelay(200);

			clk_prepare_enable(motg->core_clk);

			clk_prepare_enable(motg->pclk);

			ret = clk_prepare_enable(motg->core_clk);

			WARN(ret, "USB core_clk enable failed\n");

			ret = clk_prepare_enable(motg->pclk);

			WARN(ret, "USB pclk enable failed\n");

		}

		if (ret)

			dev_err(motg->phy.dev, "usb hs_clk deassert failed\n");
@@ -1204,8 +1206,10 @@ static int msm_otg_resume(struct msm_otg *motg) 
	}



	if (motg->lpm_flags & CLOCKS_DOWN) {

		clk_prepare_enable(motg->core_clk);

		clk_prepare_enable(motg->pclk);

		ret = clk_prepare_enable(motg->core_clk);

		WARN(ret, "USB core_clk enable failed\n");

		ret = clk_prepare_enable(motg->pclk);

		WARN(ret, "USB pclk enable failed\n");

		motg->lpm_flags &= ~CLOCKS_DOWN;

	}