diff options
| author | Nikesh Oswal <noswal@nvidia.com> | 2011-08-24 12:41:50 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-25 11:41:31 -0700 |
| commit | 77f5ca067071f1ae06532fe0f471b3913804e9f6 (patch) | |
| tree | aedcc6312067be9e5e2516d6750be3f0df1b1420 /sound | |
| parent | fe60446e6927ca002e9bde818af560095081371b (diff) | |
Asoc: tegra: cardhu: bt-sco bringup
bt-sco was broken because i2s dai was wrongly configured in
machine driver and there were also issues with setting i2s bit
clock
Bug 864984
Change-Id: I950bc92633c884180c0d48bc3654d576b8529734
Reviewed-on: http://git-master/r/48883
Tested-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_soc_wm8903.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sound/soc/tegra/tegra_soc_wm8903.c b/sound/soc/tegra/tegra_soc_wm8903.c index d4c14bfbc374..f8ab15c30b86 100644 --- a/sound/soc/tegra/tegra_soc_wm8903.c +++ b/sound/soc/tegra/tegra_soc_wm8903.c @@ -209,7 +209,9 @@ static int tegra_voice_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; struct tegra_i2s_info *info = cpu_dai->private_data; - int dai_flag = 0, sys_clk; + struct tegra_audio_platform_data* i2s_pdata = info->pdata; + int dai_flag = 0; + unsigned int bit_clk; int err; enum dac_dap_data_format data_fmt; @@ -241,14 +243,14 @@ static int tegra_voice_hw_params(struct snd_pcm_substream *substream, return err; } - sys_clk = tegra_das_get_mclk_rate(); - err = snd_soc_dai_set_sysclk(codec_dai, 0, sys_clk, SND_SOC_CLOCK_IN); + bit_clk = (unsigned int) i2s_pdata->dev_clk_rate; + err = snd_soc_dai_set_sysclk(codec_dai, 0, bit_clk, SND_SOC_CLOCK_IN); if (err < 0) { pr_err("cpu_dai clock not set\n"); return err; } - err = snd_soc_dai_set_sysclk(cpu_dai, 0, sys_clk, SND_SOC_CLOCK_IN); + err = snd_soc_dai_set_sysclk(cpu_dai, 0, bit_clk, SND_SOC_CLOCK_IN); if (err < 0) { pr_err("cpu_dai clock not set\n"); return err; @@ -550,14 +552,13 @@ static struct snd_soc_dai_link tegra_soc_dai[] = { TEGRA_CREATE_SOC_DAI_LINK("WM8903", "WM8903 HiFi", &tegra_i2s_dai[1], &wm8903_dai, &tegra_hifi_ops), - TEGRA_CREATE_SOC_DAI_LINK("Tegra-generic-0", "Tegra BB Voice", - &tegra_i2s_dai[2], &tegra_generic_codec_dai[1], - &tegra_voice_ops), - TEGRA_CREATE_SOC_DAI_LINK("Tegra-generic-1", "Tegra BT Voice", &tegra_i2s_dai[3], &tegra_generic_codec_dai[2], &tegra_voice_ops), + TEGRA_CREATE_SOC_DAI_LINK("Tegra-generic-0", "Tegra BB Voice", + &tegra_i2s_dai[2], &tegra_generic_codec_dai[1], + &tegra_voice_ops), #endif TEGRA_CREATE_SOC_DAI_LINK("Tegra-spdif", "Tegra Spdif", |