aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-10 22:31:22 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-11 23:59:11 -0500
commit3628137646e2ee25c9e46ba9d2c20b313e4a1a25 (patch)
tree68d0dff220f90369d531989f6d97f84e16607312
parent0a105ddb35aa702d975cb902d8d2c0cde4f1f231 (diff)
ASoC: Raise Speyside audio system clock rate to 512fs
To support advanced system functionality for additional components; the actively used clocks will remain the same for current components. Also factor the rate out to a single #define while we're at it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/samsung/speyside.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 18e6356e86db..0222d8636323 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -19,6 +19,7 @@
19#include "../codecs/wm9081.h" 19#include "../codecs/wm9081.h"
20 20
21#define WM8996_HPSEL_GPIO 214 21#define WM8996_HPSEL_GPIO 214
22#define MCLK_AUDIO_RATE (512 * 48000)
22 23
23static int speyside_set_bias_level(struct snd_soc_card *card, 24static int speyside_set_bias_level(struct snd_soc_card *card,
24 struct snd_soc_dapm_context *dapm, 25 struct snd_soc_dapm_context *dapm,
@@ -67,7 +68,7 @@ static int speyside_set_bias_level_post(struct snd_soc_card *card,
67 if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) { 68 if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
68 ret = snd_soc_dai_set_pll(codec_dai, 0, 69 ret = snd_soc_dai_set_pll(codec_dai, 0,
69 WM8996_FLL_MCLK2, 70 WM8996_FLL_MCLK2,
70 32768, 48000 * 256); 71 32768, MCLK_AUDIO_RATE);
71 if (ret < 0) { 72 if (ret < 0) {
72 pr_err("Failed to start FLL\n"); 73 pr_err("Failed to start FLL\n");
73 return ret; 74 return ret;
@@ -75,7 +76,7 @@ static int speyside_set_bias_level_post(struct snd_soc_card *card,
75 76
76 ret = snd_soc_dai_set_sysclk(codec_dai, 77 ret = snd_soc_dai_set_sysclk(codec_dai,
77 WM8996_SYSCLK_FLL, 78 WM8996_SYSCLK_FLL,
78 48000 * 256, 79 MCLK_AUDIO_RATE,
79 SND_SOC_CLOCK_IN); 80 SND_SOC_CLOCK_IN);
80 if (ret < 0) 81 if (ret < 0)
81 return ret; 82 return ret;
@@ -224,7 +225,7 @@ static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm)
224{ 225{
225 /* At any time the WM9081 is active it will have this clock */ 226 /* At any time the WM9081 is active it will have this clock */
226 return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0, 227 return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0,
227 48000 * 256, 0); 228 MCLK_AUDIO_RATE, 0);
228} 229}
229 230
230static struct snd_soc_aux_dev speyside_aux_dev[] = { 231static struct snd_soc_aux_dev speyside_aux_dev[] = {