Skip to content

Commit

Permalink
ASoC: support sample sizes properly in the WM8776 codec driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Timur Tabi authored and Mark Brown committed Sep 16, 2011
1 parent cc2115c commit d1dc698
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions sound/soc/codecs/wm8776.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream,
int ratio_shift, master;
int i;

iface = 0;

switch (dai->driver->id) {
case WM8776_DAI_DAC:
iface_reg = WM8776_DACIFCTRL;
Expand All @@ -233,20 +231,23 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream,
return -EINVAL;
}


/* Set word length */
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
switch (snd_pcm_format_width(params_format(params))) {
case 16:
iface = 0;
case 20:
iface = 0x10;
break;
case SNDRV_PCM_FORMAT_S20_3LE:
iface |= 0x10;
case 24:
iface = 0x20;
break;
case SNDRV_PCM_FORMAT_S24_LE:
iface |= 0x20;
break;
case SNDRV_PCM_FORMAT_S32_LE:
iface |= 0x30;
case 32:
iface = 0x30;
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 */
Expand Down

0 comments on commit d1dc698

Please sign in to comment.