From 0760034557c1dab57536da122fcc25a5ed285932 Mon Sep 17 00:00:00 2001 From: Zhe Wang Date: Fri, 9 Aug 2019 14:34:02 +0800 Subject: [PATCH] audio: if hdmiin is unsatble, set default resample to 48K [2/2] PD#TV-8378 Problem: shutdown test for hdmiin, sometimes audio is silence. Solution: if hdmiin is unsatble, set default resample to 48K Verify: X301 T972 Change-Id: I31acc38772006646176092968eb23628e23dbaf7 Signed-off-by: Zhe Wang --- sound/soc/amlogic/auge/resample.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sound/soc/amlogic/auge/resample.c b/sound/soc/amlogic/auge/resample.c index dab9788fbac6..5a2762b06379 100644 --- a/sound/soc/amlogic/auge/resample.c +++ b/sound/soc/amlogic/auge/resample.c @@ -129,20 +129,16 @@ static int resample_clk_set(struct audioresample *p_resample) { int ret = 0; - /* enable clock */ - if (p_resample->enable) { + /* defaule tdm out mclk to resample clk */ + clk_set_rate(p_resample->pll, 48000 * CLK_RATIO * 2); + clk_set_rate(p_resample->sclk, 48000 * CLK_RATIO); + clk_set_rate(p_resample->clk, 48000 * CLK_RATIO); - /* defaule tdm out mclk to resample clk */ - clk_set_rate(p_resample->pll, 48000 * CLK_RATIO * 2); - clk_set_rate(p_resample->sclk, 48000 * CLK_RATIO); - clk_set_rate(p_resample->clk, 48000 * CLK_RATIO); - - pr_info("%s, resample_pll:%lu, sclk:%lu, clk:%lu\n", - __func__, - clk_get_rate(p_resample->pll), - clk_get_rate(p_resample->sclk), - clk_get_rate(p_resample->clk)); - } + pr_info("%s, resample_pll:%lu, sclk:%lu, clk:%lu\n", + __func__, + clk_get_rate(p_resample->pll), + clk_get_rate(p_resample->sclk), + clk_get_rate(p_resample->clk)); return ret; } @@ -249,7 +245,7 @@ int resample_set(enum resample_idx id, enum samplerate_index index, bool force) set_resample_rate_index(id, index); resample_rate = resample_idx2rate(index); - ret = audio_resample_set(p_resample, (bool)index, resample_rate); + ret = audio_resample_set(p_resample, true, resample_rate); if (ret) return ret;