From 51206d2077e7b0df6bade57fec0977c38c5d40b1 Mon Sep 17 00:00:00 2001 From: wuhao Date: Wed, 5 Jun 2013 18:36:35 +0800 Subject: [PATCH] rk616 codec :if do not config SPDIF,MCLK not fixed to 12M when hdmi is in --- sound/soc/rk29/rk_rk616.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/rk29/rk_rk616.c b/sound/soc/rk29/rk_rk616.c index 96970ba06aa8..2df88e397a78 100755 --- a/sound/soc/rk29/rk_rk616.c +++ b/sound/soc/rk29/rk_rk616.c @@ -99,11 +99,13 @@ static int rk_hifi_hw_params(struct snd_pcm_substream *substream, DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__); + #if defined(CONFIG_SND_RK_SOC_SPDIF) /* MCLK must be 12M when HDMI is in */ if (get_hdmi_state()) { DBG("%s : HDMI is in, do not set sys clk\n",__FUNCTION__); return 0; } + #endif /* set codec DAI configuration */ #if defined (CONFIG_SND_RK29_CODEC_SOC_SLAVE) @@ -180,10 +182,12 @@ static int rk_voice_hw_params(struct snd_pcm_substream *substream, DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__); /* MCLK must be 12M when HDMI is in */ + #if defined(CONFIG_SND_RK_SOC_SPDIF) if (get_hdmi_state()) { DBG("%s : HDMI is in, do not set sys clk\n",__FUNCTION__); return 0; } + #endif /* set codec DAI configuration */ ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A | -- 2.34.1