shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rk3308_codec: fix the orders of dac path state

Browse Source 
Change-Id: Ibfba1a4db2ba2a9a52d79bfe4b0b55be104a61a6
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
This commit is contained in:
Xing Zheng
2018-07-02 20:30:18 +08:00
committed by Tao Huang
parent 814a322a7d
commit 7764b275f4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/rk3308_codec.c
View File

@@ -2587,14 +2587,12 @@ static int rk3308_codec_close_capture(struct rk3308_codec_priv *rk3308)
static int rk3308_codec_open_playback(struct rk3308_codec_priv *rk3308)
{
rk3308_codec_dac_enable(rk3308);
rk3308_codec_set_dac_path_state(rk3308, PATH_BUSY);
return 0;
}
static int rk3308_codec_close_playback(struct rk3308_codec_priv *rk3308)
{
rk3308_codec_set_dac_path_state(rk3308, PATH_IDLE);
rk3308_codec_dac_disable(rk3308);
return 0;
@@ -2706,6 +2704,7 @@ static int rk3308_hw_params(struct snd_pcm_substream *substream,
rk3308_codec_dac_mclk_enable(rk3308);
rk3308_codec_open_playback(rk3308);
rk3308_codec_dac_dig_config(rk3308, params);
rk3308_codec_set_dac_path_state(rk3308, PATH_BUSY);
} else {
rk3308_codec_adc_mclk_enable(rk3308);
ret = rk3308_codec_update_adc_grps(rk3308, params);
@@ -2797,13 +2796,15 @@ static void rk3308_pcm_shutdown(struct snd_pcm_substream *substream,
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
rk3308_codec_close_playback(rk3308);
rk3308_codec_dac_mclk_disable(rk3308);
regcache_cache_only(rk3308->regmap, false);
regcache_sync(rk3308->regmap);
rk3308_codec_set_dac_path_state(rk3308, PATH_IDLE);
} else {
rk3308_codec_close_capture(rk3308);
rk3308_codec_adc_mclk_disable(rk3308);
regcache_cache_only(rk3308->regmap, false);
regcache_sync(rk3308->regmap);
}
regcache_cache_only(rk3308->regmap, false);
regcache_sync(rk3308->regmap);
}
static struct snd_soc_dai_ops rk3308_dai_ops = {