diff options
| author | Frank Mandarino <fmandarino@endrelia.com> | 2006-10-19 18:22:53 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 09:01:05 +0100 |
| commit | 543a0fbe18d0b44f3d037fe6b59458fa0c0d5e4b (patch) | |
| tree | 152067793c3f857abab59cb38ef08b341ee977ad /sound/soc | |
| parent | d7923b2a816625dc4208d89471da6bdcab188cdb (diff) | |
| download | op-kernel-dev-543a0fbe18d0b44f3d037fe6b59458fa0c0d5e4b.zip op-kernel-dev-543a0fbe18d0b44f3d037fe6b59458fa0c0d5e4b.tar.gz | |
[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')
| -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 8c4d3b9..2eee427 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[] = { .flags = SND_SOC_DAI_BFS_DIV, .fs = 750, .bfs = SND_SOC_FSBD(3), - .flags (7 << 16 | 133), + .priv = (7 << 16 | 133), }, - /* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */ + /* 32k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */ { .fmt = AT91RM9200_I2S_DAIFMT, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, - .pcmrate = SNDRV_PCM_RATE_22050, + .pcmrate = SNDRV_PCM_RATE_32000, .pcmdir = AT91RM9200_I2S_DIR, .flags = SND_SOC_DAI_BFS_DIV, - .fs = 500, - .bfs = SND_SOC_FSBD(10), - .priv = (25 << 16 | 24), + .fs = 375, + .bfs = SND_SOC_FSBD(3), + .priv = (7 << 16 | 66), }, - /* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */ + /* 48k: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */ { .fmt = AT91RM9200_I2S_DAIFMT, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, |
