Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 270657
b: refs/heads/master
c: ef473fe
h: refs/heads/master
i:
  270655: 0da7848
v: v3
  • Loading branch information
Mark Brown committed Sep 23, 2011
1 parent d7cd22f commit 3cccd5a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0a742681e6072a71f30cfe6312f758f1cd185c21
refs/heads/master: ef473fee67f88c0032eb5e55d940b81b08c0ee89
8 changes: 6 additions & 2 deletions trunk/sound/soc/samsung/speyside_wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

#include "../codecs/wm8962.h"

static int sample_rate = 44100;

static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
struct snd_soc_dapm_context *dapm,
enum snd_soc_bias_level level)
Expand All @@ -31,13 +33,13 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
if (dapm->bias_level == SND_SOC_BIAS_STANDBY) {
ret = snd_soc_dai_set_pll(codec_dai, WM8962_FLL,
WM8962_FLL_MCLK, 32768,
44100 * 512);
sample_rate * 512);
if (ret < 0)
pr_err("Failed to start FLL: %d\n", ret);

ret = snd_soc_dai_set_sysclk(codec_dai,
WM8962_SYSCLK_FLL,
44100 * 512,
sample_rate * 512,
SND_SOC_CLOCK_IN);
if (ret < 0) {
pr_err("Failed to set SYSCLK: %d\n", ret);
Expand Down Expand Up @@ -109,6 +111,8 @@ static int speyside_wm8962_hw_params(struct snd_pcm_substream *substream,
if (ret < 0)
return ret;

sample_rate = params_rate(params);

return 0;
}

Expand Down

0 comments on commit 3cccd5a

Please sign in to comment.