diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-11-17 08:28:56 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-11-17 11:44:35 +0000 |
commit | b323dd30718e2055adb5534e52f685a57c119c18 (patch) | |
tree | 322b9637e8210482d061cdf156ca5bc4fb72119c /sound/soc/codecs/ak4613.c | |
parent | 35299f1779dbdcb61af4305904963b5bc9276eb9 (diff) | |
download | linux-stable-b323dd30718e2055adb5534e52f685a57c119c18.tar.gz linux-stable-b323dd30718e2055adb5534e52f685a57c119c18.tar.bz2 linux-stable-b323dd30718e2055adb5534e52f685a57c119c18.zip |
ASoC: ak4613: don't overwrite CTRL2 register
Current code set DFS settings on CTRL2 register, but it overwrite
default settings. This patch fixup it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/ak4613.c')
-rw-r--r-- | sound/soc/codecs/ak4613.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index dab127603ff6..62c08a6395af 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -70,6 +70,7 @@ #define FMT_MASK (0xf8) /* CTRL2 */ +#define DFS_MASK (3 << 2) #define DFS_NORMAL_SPEED (0 << 2) #define DFS_DOUBLE_SPEED (1 << 2) #define DFS_QUAD_SPEED (2 << 2) @@ -361,7 +362,7 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, fmt_ctrl = AUDIO_IFACE_TO_VAL(iface); snd_soc_update_bits(codec, CTRL1, FMT_MASK, fmt_ctrl); - snd_soc_write(codec, CTRL2, ctrl2); + snd_soc_update_bits(codec, CTRL2, DFS_MASK, ctrl2); snd_soc_write(codec, ICTRL, priv->ic); snd_soc_write(codec, OCTRL, priv->oc); |