diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-01 14:32:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-01 15:20:59 -0400 |
commit | 1e025a3692014e7a29a0b0b01de5cdc2b6ade3cf (patch) | |
tree | 5f0db47e7bf038c1def2a35c3edce0c563efbbee /sound/soc/samsung/speyside.c | |
parent | cf4a39105ab7d73583f142c492f2880247f520f9 (diff) |
ASoC: Update speyside audio driver for hardware revision 2
Revision 2 of the Speyside platform supplies a 32kHz clock on MCLK2 rather
than MCLK1.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/samsung/speyside.c')
-rw-r--r-- | sound/soc/samsung/speyside.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 360a333cb7c0..93078b15a8f9 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c | |||
@@ -27,12 +27,12 @@ static int speyside_set_bias_level(struct snd_soc_card *card, | |||
27 | 27 | ||
28 | switch (level) { | 28 | switch (level) { |
29 | case SND_SOC_BIAS_STANDBY: | 29 | case SND_SOC_BIAS_STANDBY: |
30 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_MCLK1, | 30 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_MCLK2, |
31 | 32768, SND_SOC_CLOCK_IN); | 31 | 32768, SND_SOC_CLOCK_IN); |
32 | if (ret < 0) | 32 | if (ret < 0) |
33 | return ret; | 33 | return ret; |
34 | 34 | ||
35 | ret = snd_soc_dai_set_pll(codec_dai, WM8915_FLL_MCLK1, | 35 | ret = snd_soc_dai_set_pll(codec_dai, WM8915_FLL_MCLK2, |
36 | 0, 0, 0); | 36 | 0, 0, 0); |
37 | if (ret < 0) { | 37 | if (ret < 0) { |
38 | pr_err("Failed to stop FLL\n"); | 38 | pr_err("Failed to stop FLL\n"); |
@@ -66,7 +66,7 @@ static int speyside_hw_params(struct snd_pcm_substream *substream, | |||
66 | if (ret < 0) | 66 | if (ret < 0) |
67 | return ret; | 67 | return ret; |
68 | 68 | ||
69 | ret = snd_soc_dai_set_pll(codec_dai, 0, WM8915_FLL_MCLK1, | 69 | ret = snd_soc_dai_set_pll(codec_dai, 0, WM8915_FLL_MCLK2, |
70 | 32768, 256 * 48000); | 70 | 32768, 256 * 48000); |
71 | if (ret < 0) | 71 | if (ret < 0) |
72 | return ret; | 72 | return ret; |
@@ -127,7 +127,7 @@ static int speyside_wm8915_init(struct snd_soc_pcm_runtime *rtd) | |||
127 | struct snd_soc_codec *codec = rtd->codec; | 127 | struct snd_soc_codec *codec = rtd->codec; |
128 | int ret; | 128 | int ret; |
129 | 129 | ||
130 | ret = snd_soc_dai_set_sysclk(dai, WM8915_SYSCLK_MCLK1, 32768, 0); | 130 | ret = snd_soc_dai_set_sysclk(dai, WM8915_SYSCLK_MCLK2, 32768, 0); |
131 | if (ret < 0) | 131 | if (ret < 0) |
132 | return ret; | 132 | return ret; |
133 | 133 | ||