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

Commit 010187fb authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: jz4740-i2s: Use clk_prepare_enable/clk_disable_unprepare 



In preparation to switching the jz4740 clk driver to the common clk framework
update the clk enable/disable calls to clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bc2716fb

sound/soc/jz4740/jz4740-i2s.c

+8 −8
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int jz4740_i2s_startup(struct snd_pcm_substream *substream, 
	ctrl |= JZ_AIC_CTRL_FLUSH;

	jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl);



	clk_enable(i2s->clk_i2s);

	clk_prepare_enable(i2s->clk_i2s);



	conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);

	conf |= JZ_AIC_CONF_ENABLE;
@@ -140,7 +140,7 @@ static void jz4740_i2s_shutdown(struct snd_pcm_substream *substream, 
	conf &= ~JZ_AIC_CONF_ENABLE;

	jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);



	clk_disable(i2s->clk_i2s);

	clk_disable_unprepare(i2s->clk_i2s);

}



static int jz4740_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
@@ -314,10 +314,10 @@ static int jz4740_i2s_suspend(struct snd_soc_dai *dai) 
		conf &= ~JZ_AIC_CONF_ENABLE;

		jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);



		clk_disable(i2s->clk_i2s);

		clk_disable_unprepare(i2s->clk_i2s);

	}



	clk_disable(i2s->clk_aic);

	clk_disable_unprepare(i2s->clk_aic);



	return 0;

}
@@ -327,10 +327,10 @@ static int jz4740_i2s_resume(struct snd_soc_dai *dai) 
	struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);

	uint32_t conf;



	clk_enable(i2s->clk_aic);

	clk_prepare_enable(i2s->clk_aic);



	if (dai->active) {

		clk_enable(i2s->clk_i2s);

		clk_prepare_enable(i2s->clk_i2s);



		conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);

		conf |= JZ_AIC_CONF_ENABLE;
@@ -368,7 +368,7 @@ static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai) 
	struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);

	uint32_t conf;



	clk_enable(i2s->clk_aic);

	clk_prepare_enable(i2s->clk_aic);



	jz4740_i2c_init_pcm_config(i2s);
@@ -388,7 +388,7 @@ static int jz4740_i2s_dai_remove(struct snd_soc_dai *dai) 
{

	struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);



	clk_disable(i2s->clk_aic);

	clk_disable_unprepare(i2s->clk_aic);

	return 0;

}