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

Commit 46dd30a8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next

parents 18923d7e 010187fb

sound/soc/codecs/jz4740.c

+0 −2
Original line number Diff line number Diff line
@@ -384,8 +384,6 @@ static int jz4740_codec_remove(struct platform_device *pdev) 
{

	snd_soc_unregister_codec(&pdev->dev);



	platform_set_drvdata(pdev, NULL);



	return 0;

}

sound/soc/jz4740/jz4740-i2s.c

+8 −9
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;

}
@@ -509,7 +509,6 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev) 
	iounmap(i2s->base);

	release_mem_region(i2s->mem->start, resource_size(i2s->mem));



	platform_set_drvdata(pdev, NULL);

	kfree(i2s);



	return 0;