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 c4573578ba1347ae9cdda9cf5963412dc67a9a69..3fe929b354e7e95ea8ad3f8881532c0edf38124d 100644 (file)
--- 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__);    \r
        \r
        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A |\r
-               SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBM_CFM ); \r
+               SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS ); \r
 \r
        switch(params_rate(params)) {\r
                case 8000:\r
@@ -152,7 +152,7 @@ static int rt3261_voice_hw_params(struct snd_pcm_substream *substream,
        /*Set the system clk for codec*/\r
        snd_soc_dai_set_pll(codec_dai, 0, RT3261_PLL1_S_MCLK, pll_out, 256 * 8000);\r
 \r
-       ret = snd_soc_dai_set_sysclk(codec_dai, 0, 256 * 8000, SND_SOC_CLOCK_IN);\r
+       ret = snd_soc_dai_set_sysclk(codec_dai, RT3261_SCLK_S_PLL1, 256 * 8000, SND_SOC_CLOCK_IN);\r
 \r
 \r
        if (ret < 0) {\r