evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: support sample sizes properly in the WM8776 codec driver

Browse source 
Use snd_pcm_format_width() to determine the sample size, instead of
checking specify sample formats and assuming that those are the only
valid format.

This change adds support for big-endian architectures (which use the _BE
formats) and the packed 24-bit format (SNDRV_PCM_FORMAT_S24_3xE).

[Fixed single letter variable name legibility problem -- broonie]

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Timur Tabi 2011-09-13 12:59:35 -05:00 • committed by Mark Brown
parent cc2115cbfc
commit d1dc698a54
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sound/soc/codecs/wm8776.c
View file

@ -216,8 +216,6 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream,
int ratio_shift, master; int ratio_shift, master;
int i; int i;
iface = 0;
switch (dai->driver->id) { switch (dai->driver->id) {
case WM8776_DAI_DAC: case WM8776_DAI_DAC:
iface_reg = WM8776_DACIFCTRL; iface_reg = WM8776_DACIFCTRL;
@ -233,20 +231,23 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
/* Set word length */ /* Set word length */
switch (params_format(params)) { switch (snd_pcm_format_width(params_format(params))) {
case SNDRV_PCM_FORMAT_S16_LE: case 16:
iface = 0;
case 20:
iface = 0x10;
break; break;
case SNDRV_PCM_FORMAT_S20_3LE: case 24:
iface |= 0x10; iface = 0x20;
break; break;
case SNDRV_PCM_FORMAT_S24_LE: case 32:
iface |= 0x20; iface = 0x30;
break;
case SNDRV_PCM_FORMAT_S32_LE:
iface |= 0x30;
break; break;
default:
dev_err(codec->dev, "Unsupported sample size: %i\n",
snd_pcm_format_width(params_format(params)));
return -EINVAL;
} }
/* Only need to set MCLK/LRCLK ratio if we're master */ /* Only need to set MCLK/LRCLK ratio if we're master */