diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-23 14:31:52 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-23 14:31:52 +0900 |
| commit | 704636f14af6b7e758e4fd5f3a901b76f9e0eb9b (patch) | |
| tree | 18419de4d7048448543a21e70b01cef43cf98f48 /sound | |
| parent | 5e4f6aa74f85a476c67a15d624ed4dcb584fea0c (diff) | |
| parent | e48c6d7f01032c42907dc2cd81b73f95490c81a1 (diff) | |
Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/pcm1792a.c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c index 7146653a8e16..3a80ba4452df 100644 --- a/sound/soc/codecs/pcm1792a.c +++ b/sound/soc/codecs/pcm1792a.c @@ -107,24 +107,35 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = dai->codec; struct pcm1792a_private *priv = snd_soc_codec_get_drvdata(codec); int val = 0, ret; - int pcm_format = params_format(params); priv->rate = params_rate(params); switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_RIGHT_J: - if (pcm_format == SNDRV_PCM_FORMAT_S24_LE || - pcm_format == SNDRV_PCM_FORMAT_S32_LE) - val = 0x02; - else if (pcm_format == SNDRV_PCM_FORMAT_S16_LE) - val = 0x00; + switch (params_width(params)) { + case 24: + case 32: + val = 2; + break; + case 16: + val = 0; + break; + default: + return -EINVAL; + } break; case SND_SOC_DAIFMT_I2S: - if (pcm_format == SNDRV_PCM_FORMAT_S24_LE || - pcm_format == SNDRV_PCM_FORMAT_S32_LE) - val = 0x05; - else if (pcm_format == SNDRV_PCM_FORMAT_S16_LE) - val = 0x04; + switch (params_width(params)) { + case 24: + case 32: + val = 5; + break; + case 16: + val = 4; + break; + default: + return -EINVAL; + } break; default: dev_err(codec->dev, "Invalid DAI format\n"); |