summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/cs4349.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-07-19 22:42:49 +0800
committerMark Brown <broonie@kernel.org>2015-07-20 18:16:16 +0100
commitda304ac37efc1900892b5067c65f0ab8acfe3955 (patch)
tree743bd49ec65e1f2370f74c603b7b57c14cc6577a /sound/soc/codecs/cs4349.c
parentdedae86d4da6c88ec2105e0bd038acc57c203bca (diff)
downloadlinux-da304ac37efc1900892b5067c65f0ab8acfe3955.tar.bz2
ASoC: cs4349: Fix setting digital interface format
Mode Control - Register 02h Digital Interface Format (DIF[2:0]) Bits 6-4 DIF2 DIF1 DIF0 Description 0 0 0 Left-Justified, up to 24-bit data 0 0 1 I²S, up to 24-bit data 0 1 0 Right-Justified, 16-bit data 0 1 1 Right-Justified, 24-bit data 1 0 0 TDM slot 0 1 0 1 TDM slot 1 1 1 0 TDM slot 2 1 1 1 TDM slot 3 The DIF_MASK is 0x70, so current code does not correctly set the DIFx setting. Fix it. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/cs4349.c')
-rw-r--r--sound/soc/codecs/cs4349.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index ab071675357e..4885695e35a7 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -96,17 +96,16 @@ static int cs4349_pcm_hw_params(struct snd_pcm_substream *substream,
{
struct snd_soc_codec *codec = dai->codec;
struct cs4349_private *cs4349 = snd_soc_codec_get_drvdata(codec);
- int mode, fmt, ret;
+ int fmt, ret;
- mode = snd_soc_read(codec, CS4349_MODE);
cs4349->rate = params_rate(params);
switch (cs4349->mode) {
case SND_SOC_DAIFMT_I2S:
- mode |= MODE_FORMAT(DIF_I2S);
+ fmt = DIF_I2S;
break;
case SND_SOC_DAIFMT_LEFT_J:
- mode |= MODE_FORMAT(DIF_LEFT_JST);
+ fmt = DIF_LEFT_JST;
break;
case SND_SOC_DAIFMT_RIGHT_J:
switch (params_width(params)) {
@@ -119,13 +118,13 @@ static int cs4349_pcm_hw_params(struct snd_pcm_substream *substream,
default:
return -EINVAL;
}
- mode |= MODE_FORMAT(fmt);
break;
default:
return -EINVAL;
}
- ret = snd_soc_write(codec, CS4349_MODE, mode);
+ ret = snd_soc_update_bits(codec, CS4349_MODE, DIF_MASK,
+ MODE_FORMAT(fmt));
if (ret < 0)
return ret;