ASoC DAI capabilities labelling
PATCH 1/1 ASoC DAI capabilities labelling
This patch suggested by Takashi changes the DAI capabilities definitions in pxa-i2s.c, at91rm9200-i2s.c, wm8731.c, wm8750.c and wm9712.c to use a label = value style.
soc/at91/at91rm9200-i2s.c +40 -12
@@ -51,24 +51,52 @@ static struct snd_soc_dai_mode at91rm920static struct snd_soc_dai_mode at91rm9200_i2s[] = {/* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */ - {AT91RM9200_I2S_DAIFMT ,SND_SOC_DAITDM_LRDW (0 ,0 ), -SNDRV_PCM_FMTBIT_S16_LE ,SNDRV_PCM_RATE_8000 ,AT91RM9200_I2S_DIR , -SND_SOC_DAI_BFS_DIV ,1500 ,SND_SOC_FSBD (10 ), (25 <<16 |74 ) }, + { + .fmt =AT91RM9200_I2S_DAIFMT , + .pcmfmt =SNDRV_PCM_FMTBIT_S16_LE , + .pcmrate =SNDRV_PCM_RATE_8000 , + .pcmdir =AT91RM9200_I2S_DIR , + .flags =SND_SOC_DAI_BFS_DIV , + .fs =1500 , + .bfs =SND_SOC_FSBD (10 ), + .priv = (25 <<16 |74 ), + },/* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */ - {AT91RM9200_I2S_DAIFMT ,SND_SOC_DAITDM_LRDW (0 ,0 ), -SNDRV_PCM_FMTBIT_S16_LE ,SNDRV_PCM_RATE_16000 ,AT91RM9200_I2S_DIR , -SND_SOC_DAI_BFS_DIV ,750 ,SND_SOC_FSBD (3 ) , (7 <<16 |133 ) }, + { + .fmt =AT91RM9200_I2S_DAIFMT , + .pcmfmt =SNDRV_PCM_FMTBIT_S16_LE , + .pcmrate =SNDRV_PCM_RATE_16000 , + .pcmdir =AT91RM9200_I2S_DIR , + .flags =SND_SOC_DAI_BFS_DIV , + .fs =750 , + .bfs =SND_SOC_FSBD (3 ), + .flags (7 << 16 | 133), + },/* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */ - {AT91RM9200_I2S_DAIFMT ,SND_SOC_DAITDM_LRDW (0 ,0 ), -SNDRV_PCM_FMTBIT_S16_LE ,SNDRV_PCM_RATE_22050 ,AT91RM9200_I2S_DIR , -SND_SOC_DAI_BFS_DIV ,500 ,SND_SOC_FSBD (10 ), (25 <<16 |24 ) }, + { + .fmt =AT91RM9200_I2S_DAIFMT , + .pcmfmt =SNDRV_PCM_FMTBIT_S16_LE , + .pcmrate =SNDRV_PCM_RATE_22050 , + .pcmdir =AT91RM9200_I2S_DIR , + .flags =SND_SOC_DAI_BFS_DIV , + .fs =500 , + .bfs =SND_SOC_FSBD (10 ), + .priv = (25 <<16 |24 ), + },/* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */ - {AT91RM9200_I2S_DAIFMT ,SND_SOC_DAITDM_LRDW (0 ,0 ), -SNDRV_PCM_FMTBIT_S16_LE ,SNDRV_PCM_RATE_48000 ,AT91RM9200_I2S_DIR , -SND_SOC_DAI_BFS_DIV ,250 ,SND_SOC_FSBD (5 ), (13 <<16 |23 ) }, + { + .fmt =AT91RM9200_I2S_DAIFMT , + .pcmfmt =SNDRV_PCM_FMTBIT_S16_LE , + .pcmrate =SNDRV_PCM_RATE_48000 , + .pcmdir =AT91RM9200_I2S_DIR , + .flags =SND_SOC_DAI_BFS_DIV , + .fs =250 , + .bfs SND_SOC_FSBD(5), + .priv = (13 <<16 |23 ), + }, };
soc/codecs/wm8731.c +135 -49
209 lines not on this page · raw message
soc/codecs/wm8750.c +234 -82
336 lines not on this page · raw message
soc/codecs/wm9712.c +5 -2
@@ -44,8 +44,11 @@ static int ac97_write(struct snd_soc_cod/* may need to expand this */ static struct snd_soc_dai_mode ac97_modes[] = { - {0 ,0 ,SNDRV_PCM_FMTBIT_S16_LE ,AC97_RATES }, - {0 ,0 ,SNDRV_PCM_FMTBIT_S18_3LE ,AC97_RATES }, + { + .pcmfmt =SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S18_3LE , + .pcmrate =AC97_RATES , + .pcmdir =AC97_DIR , + }, };/*
soc/pxa/pxa2xx-i2s.c +69 -22
99 lines not on this page · raw message
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
Takashi Iwai
AppliedAt Fri, 13 Oct 2006 11:17:37 +0100,
Quoted 6 lines · Liam Girdwood
This patch suggested by Takashi changes the DAI capabilities definitions in
pxa-i2s.c,at91rm9200-i2s.c,wm8731.c,wm8750.candwm9712.cto use a label = value style.Signed-off-by Liam Girdwood <[email protected]>
Thanks, applied to HG tree.
Takashi
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642