From: 宋秀杰 <sxj@rock-chips.com>
Date: Thu, 16 Aug 2012 09:58:48 +0000 (+0800)
Subject: phonepad: codec set slave when BT incall, and set pll.
X-Git-Tag: firefly_0821_release~8921^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4cf1f94c060071ca1758814c2d4a2e2a74ef7d1a;p=firefly-linux-kernel-4.4.55.git

phonepad: codec set slave when BT incall, and set pll.
---

diff --git a/sound/soc/rk29/rk29_rt3261.c b/sound/soc/rk29/rk29_rt3261.c
index c4573578ba13..3fe929b354e7 100644
--- a/sound/soc/rk29/rk29_rt3261.c
+++ b/sound/soc/rk29/rk29_rt3261.c
@@ -126,7 +126,7 @@ static int rt3261_voice_hw_params(struct snd_pcm_substream *substream,
 	DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);    
        
 	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A |
-		SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBM_CFM ); 
+		SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS ); 
 
 	switch(params_rate(params)) {
 		case 8000:
@@ -152,7 +152,7 @@ static int rt3261_voice_hw_params(struct snd_pcm_substream *substream,
 	/*Set the system clk for codec*/
 	snd_soc_dai_set_pll(codec_dai, 0, RT3261_PLL1_S_MCLK, pll_out, 256 * 8000);
 
- 	ret = snd_soc_dai_set_sysclk(codec_dai, 0, 256 * 8000, SND_SOC_CLOCK_IN);
+ 	ret = snd_soc_dai_set_sysclk(codec_dai, RT3261_SCLK_S_PLL1, 256 * 8000, SND_SOC_CLOCK_IN);
 
 
 	if (ret < 0) {