ASoC 0.13 WM9712 codec driver
PATCH 6/19 ASoC 0.13 WM9712 codec driver
This patch updates the WM9712 codec driver to the new API in ASoC 0.13.
Changes:-
o Removed DAI capabilities matching code in favour of manual matching in the machine drivers.
o Added DAI operations for codec and CPU interfaces.
o Removed config_sysclk() function and struct snd_soc_clock_info. No longer needed as clocking is now configured manually in the machine drivers. Also removed other clocking data from structures.
Privacy & Confidentiality Notice
-------------------------------------------------
This message and any attachments contain privileged and confidential information that is intended solely for the person(s) to whom it is addressed. If you are not an intended recipient you must not: read; copy; distribute; discuss; take any action in or make any reliance upon the contents of this message; nor open or read any attachment. If you have received this message in error, please notify us as soon as possible on the following telephone number and destroy this message including any attachments. Thank you.
-------------------------------------------------
Wolfson Microelectronics plc
Tel: +44 (0)131 272 7000
Fax: +44 (0)131 272 7001
Web: www.wolfsonmicro.com
Registered in Scotland
Company number SC089839
Registered office:
Westfield House, 26 Westfield Road, Edinburgh, EH11 2QB, UK
-------------------------------------------------------------------------
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
It does help if I attach the patch :)
Quoted 7 lines · Liam Girdwood
This patch updates the WM9712 codec driver to the new API in ASoC 0.13.
Changes:-
o Removed DAI capabilities matching code in favour of manual matching in the machine drivers.
Quoted 7 lines
o Added DAI operations for codec and CPU interfaces.
o Removed
config_sysclk()function and structsnd_soc_clock_info. No longer needed as clocking is now configured manually in the machine drivers. Also removed other clocking data from structures.Signed-off-by Liam Girdwood <[email protected]>
soc/codecs/wm9712.c +15 -29
@@ -33,23 +33,6 @@ static unsigned int ac97_read(struct snd unsigned int reg);static int ac97_write (struct snd_soc_codec *codec,unsigned int reg,unsigned int val); - -#define AC97_DIR \ - (SND_SOC_DAIDIR_PLAYBACK | SND_SOC_DAIDIR_CAPTURE) - -#define AC97_RATES \ - (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \ - SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ - SNDRV_PCM_RATE_48000) - -/* may need to expand this */ -static struct snd_soc_dai_mode ac97_modes[] = { - { - .pcmfmt =SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S18_3LE , - .pcmrate =AC97_RATES , - .pcmdir =AC97_DIR , - }, -};/* * WM9712 register cache
@@ -554,35 +537,38 @@ static int ac97_aux_prepare(struct snd_preturn ac97_write (codec,AC97_PCM_SURR_DAC_RATE , runtime->rate); } +#define WM9712_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ + SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) +struct snd_soc_codec_dai wm9712_dai[] = { { .name ="AC97 HiFi" , .playback = { .stream_name ="HiFi Playback" , .channels_min =1 , - .channels_max =2 ,}, + .channels_max =2 , + .rates =WM9712_AC97_RATES , + .formats =SNDRV_PCM_FMTBIT_S16_LE ,}, .capture = { .stream_name ="HiFi Capture" , .channels_min =1 , - .channels_max =2 ,}, + .channels_max =2 , + .rates =WM9712_AC97_RATES , + .formats =SNDRV_PCM_FMTBIT_S16_LE ,}, .ops = { .prepare = ac97_prepare,}, - .caps = { - .num_modes =ARRAY_SIZE (ac97_modes), - .mode = ac97_modes,}, - }, - { +}, +{ .name ="AC97 Aux" , .playback = { .stream_name ="Aux Playback" , .channels_min =1 , - .channels_max =1 ,}, + .channels_max =1 , + .rates =WM9712_AC97_RATES , + .formats =SNDRV_PCM_FMTBIT_S16_LE ,}, .ops = { .prepare = ac97_aux_prepare,}, - .caps = { - .num_modes =ARRAY_SIZE (ac97_modes), - .mode = ac97_modes,}, - }, +} };EXPORT_SYMBOL_GPL (wm9712_dai);
-------------------------------------------------------------------------
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