[PATCH 10/12] ASoC: mxs-saif: convert to clk_prepare/clk_unprepare

Marek Vasut marek.vasut at gmail.com
Tue Dec 20 08:49:37 EST 2011


> 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 at linaro.org>
> Cc: Dong Aisheng <b29396 at freescale.com>
> Cc: Liam Girdwood <lrg at ti.com>
> Cc: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/mxs/mxs-saif.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
> index 76dc74d..ef1abb5 100644
> --- a/sound/soc/mxs/mxs-saif.c
> +++ b/sound/soc/mxs/mxs-saif.c
> @@ -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,
> @@ -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;

Acked-by: Marek Vasut <marek.vasut at gmail.com>



More information about the linux-arm-kernel mailing list