Skip to content

Commit

Permalink
ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
Browse files Browse the repository at this point in the history
The patch converts mxs-saif driver to clk_prepare/clk_unprepare by
using helper functions clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Dong Aisheng <b29396@freescale.com>
Cc: Liam Girdwood <lrg@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
  • Loading branch information
Shawn Guo committed Dec 28, 2011
1 parent ca4c22d commit 67939b2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/mxs/mxs-saif.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ int mxs_saif_put_mclk(unsigned int saif_id)
return -EBUSY;
}

clk_disable(saif->clk);
clk_disable_unprepare(saif->clk);

/* disable MCLK output */
__raw_writel(BM_SAIF_CTRL_CLKGATE,
Expand Down Expand Up @@ -264,7 +264,7 @@ int mxs_saif_get_mclk(unsigned int saif_id, unsigned int mclk,
if (ret)
return ret;

ret = clk_enable(saif->clk);
ret = clk_prepare_enable(saif->clk);
if (ret)
return ret;

Expand Down

0 comments on commit 67939b2

Please sign in to comment.