From: Frank Mandarino Date: Thu, 19 Oct 2006 16:22:53 +0000 (+0200) Subject: [ALSA] ASoC AT91 DAI modes update X-Git-Tag: v2.6.21-rc1~83^2~62^2~155 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=543a0fbe18d0b44f3d037fe6b59458fa0c0d5e4b;p=platform%2Fkernel%2Flinux-stable.git [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 Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- 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,