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

Commit 7f371b98 authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

msm_sdcc: Convert to clk_prepare/unprepare 



Add calls to clk_prepare and unprepare so that MSM can migrate to
the common clock framework.

Cc: Chris Ball <cjb@laptop.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent b99a8f62

drivers/mmc/host/msm_sdcc.c

+13 −1
Original line number Diff line number Diff line
@@ -1268,10 +1268,18 @@ msmsdcc_probe(struct platform_device *pdev) 
		goto clk_put;

	}



	ret = clk_prepare(host->pclk);

	if (ret)

		goto clk_put;



	ret = clk_prepare(host->clk);

	if (ret)

		goto clk_unprepare_p;



	/* Enable clocks */

	ret = msmsdcc_enable_clocks(host);

	if (ret)

		goto clk_put;

		goto clk_unprepare;



	host->pclk_rate = clk_get_rate(host->pclk);

	host->clk_rate = clk_get_rate(host->clk);
@@ -1386,6 +1394,10 @@ msmsdcc_probe(struct platform_device *pdev) 
		free_irq(host->stat_irq, host);

 clk_disable:

	msmsdcc_disable_clocks(host, 0);

 clk_unprepare:

	clk_unprepare(host->clk);

 clk_unprepare_p:

	clk_unprepare(host->pclk);

 clk_put:

	clk_put(host->clk);

 pclk_put: