diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:19 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:19 +0200 |
commit | 13b137ef0367237909bb2dc38babfb8305154676 (patch) | |
tree | a5d756fcc6603da970ef8c5e263244c6166a2fba /sound/soc/samsung/smdk_wm8994.c | |
parent | Merge branch 'fix/asoc' into for-linus (diff) | |
parent | Merge branch 'for-3.0' into for-3.1 (diff) | |
download | linux-dev-13b137ef0367237909bb2dc38babfb8305154676.tar.xz linux-dev-13b137ef0367237909bb2dc38babfb8305154676.zip |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/samsung/smdk_wm8994.c')
-rw-r--r-- | sound/soc/samsung/smdk_wm8994.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index e7c1009a1e1d..45fbe2b3727f 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -8,6 +8,7 @@ */ #include "../codecs/wm8994.h" +#include <sound/pcm_params.h> /* * Default CFG switch settings to use this driver: @@ -44,7 +45,9 @@ static int smdk_hw_params(struct snd_pcm_substream *substream, int ret; /* AIF1CLK should be >=3MHz for optimal performance */ - if (params_rate(params) == 8000 || params_rate(params) == 11025) + if (params_format(params) == SNDRV_PCM_FORMAT_S24_LE) + pll_out = params_rate(params) * 384; + else if (params_rate(params) == 8000 || params_rate(params) == 11025) pll_out = params_rate(params) * 512; else pll_out = params_rate(params) * 256; |