aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-07-02 06:51:19 -0400
committerJaroslav Kysela <perex@perex.cz>2008-07-10 03:32:16 -0400
commit5415552d21150dbfbff012de2b59e685ea232b1e (patch)
treeb0c0c21287c1f425fa0e92a19423ed6bd3842313
parent25552e87aa4102f048f1a8a8ddc87c96593c304e (diff)
ALSA: ASoC: Advertise 16000Hz rate for WM9713 PCM interface
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--sound/soc/codecs/wm9713.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 0db963747369..a4806189044d 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1001,9 +1001,18 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream)
1001 return ac97_write(codec, AC97_PCM_SURR_DAC_RATE, runtime->rate); 1001 return ac97_write(codec, AC97_PCM_SURR_DAC_RATE, runtime->rate);
1002} 1002}
1003 1003
1004#define WM9713_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ 1004#define WM9713_RATES (SNDRV_PCM_RATE_8000 | \
1005 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\ 1005 SNDRV_PCM_RATE_11025 | \
1006 SNDRV_PCM_RATE_48000) 1006 SNDRV_PCM_RATE_22050 | \
1007 SNDRV_PCM_RATE_44100 | \
1008 SNDRV_PCM_RATE_48000)
1009
1010#define WM9713_PCM_RATES (SNDRV_PCM_RATE_8000 | \
1011 SNDRV_PCM_RATE_11025 | \
1012 SNDRV_PCM_RATE_16000 | \
1013 SNDRV_PCM_RATE_22050 | \
1014 SNDRV_PCM_RATE_44100 | \
1015 SNDRV_PCM_RATE_48000)
1007 1016
1008#define WM9713_PCM_FORMATS \ 1017#define WM9713_PCM_FORMATS \
1009 (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \ 1018 (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \
@@ -1051,13 +1060,13 @@ struct snd_soc_codec_dai wm9713_dai[] = {
1051 .stream_name = "Voice Playback", 1060 .stream_name = "Voice Playback",
1052 .channels_min = 1, 1061 .channels_min = 1,
1053 .channels_max = 1, 1062 .channels_max = 1,
1054 .rates = WM9713_RATES, 1063 .rates = WM9713_PCM_RATES,
1055 .formats = WM9713_PCM_FORMATS,}, 1064 .formats = WM9713_PCM_FORMATS,},
1056 .capture = { 1065 .capture = {
1057 .stream_name = "Voice Capture", 1066 .stream_name = "Voice Capture",
1058 .channels_min = 1, 1067 .channels_min = 1,
1059 .channels_max = 2, 1068 .channels_max = 2,
1060 .rates = WM9713_RATES, 1069 .rates = WM9713_PCM_RATES,
1061 .formats = WM9713_PCM_FORMATS,}, 1070 .formats = WM9713_PCM_FORMATS,},
1062 .ops = { 1071 .ops = {
1063 .hw_params = wm9713_pcm_hw_params, 1072 .hw_params = wm9713_pcm_hw_params,