diff options
author | Frank Mandarino <fmandarino@endrelia.com> | 2006-10-19 12:22:53 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:01:05 -0500 |
commit | 543a0fbe18d0b44f3d037fe6b59458fa0c0d5e4b (patch) | |
tree | 152067793c3f857abab59cb38ef08b341ee977ad /sound/soc/at91 | |
parent | d7923b2a816625dc4208d89471da6bdcab188cdb (diff) |
[ALSA] ASoC AT91 DAI modes update
This patch by Frank Mandarino updates the AT91RM9200 I2S DAI audio modes
as follows:-
o fixes a typo in the 16k mode
o removes experimental 24k mode
o adds a 32k mode.
Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/soc/at91')
-rw-r--r-- | sound/soc/at91/at91rm9200-i2s.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/at91/at91rm9200-i2s.c b/sound/soc/at91/at91rm9200-i2s.c index 8c4d3b999053..2eee427b1e5c 100644 --- a/sound/soc/at91/at91rm9200-i2s.c +++ b/sound/soc/at91/at91rm9200-i2s.c | |||
@@ -71,22 +71,22 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = { | |||
71 | .flags = SND_SOC_DAI_BFS_DIV, | 71 | .flags = SND_SOC_DAI_BFS_DIV, |
72 | .fs = 750, | 72 | .fs = 750, |
73 | .bfs = SND_SOC_FSBD(3), | 73 | .bfs = SND_SOC_FSBD(3), |
74 | .flags (7 << 16 | 133), | 74 | .priv = (7 << 16 | 133), |
75 | }, | 75 | }, |
76 | 76 | ||
77 | /* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */ | 77 | /* 32k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */ |
78 | { | 78 | { |
79 | .fmt = AT91RM9200_I2S_DAIFMT, | 79 | .fmt = AT91RM9200_I2S_DAIFMT, |
80 | .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, | 80 | .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, |
81 | .pcmrate = SNDRV_PCM_RATE_22050, | 81 | .pcmrate = SNDRV_PCM_RATE_32000, |
82 | .pcmdir = AT91RM9200_I2S_DIR, | 82 | .pcmdir = AT91RM9200_I2S_DIR, |
83 | .flags = SND_SOC_DAI_BFS_DIV, | 83 | .flags = SND_SOC_DAI_BFS_DIV, |
84 | .fs = 500, | 84 | .fs = 375, |
85 | .bfs = SND_SOC_FSBD(10), | 85 | .bfs = SND_SOC_FSBD(3), |
86 | .priv = (25 << 16 | 24), | 86 | .priv = (7 << 16 | 66), |
87 | }, | 87 | }, |
88 | 88 | ||
89 | /* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */ | 89 | /* 48k: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */ |
90 | { | 90 | { |
91 | .fmt = AT91RM9200_I2S_DAIFMT, | 91 | .fmt = AT91RM9200_I2S_DAIFMT, |
92 | .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, | 92 | .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, |