aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Handrigan <Paul.Handrigan@cirrus.com>2014-08-28 10:54:10 -0500
committerMark Brown <broonie@linaro.org>2014-08-28 19:01:12 +0100
commitfb18cd2a62f597557d5078d8fa03bb6930fe839f (patch)
tree838d53ab7611eeb5f4a02f3497b3b00e2ac78725
parentc98853aec1f7a05545642b6ca8591fd13b2fc7b6 (diff)
downloadlinux-fb18cd2a62f597557d5078d8fa03bb6930fe839f.tar.gz
ASoC: cs4265: Fix setting of functional mode and clock divider
Reported-by: Zoltán Szenczi <zoltan@raspberrypi.org> Signed-off-by: Paul Handrigan <Paul.Handrigan@cirrus.com> Signed-off-by: Mark Brown <broonie@linaro.org> Cc: stable@vger.kernel.org
-rw-r--r--sound/soc/codecs/cs4265.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c
index 8811689e372b..98523209f739 100644
--- a/sound/soc/codecs/cs4265.c
+++ b/sound/soc/codecs/cs4265.c
@@ -435,10 +435,10 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream,
index = cs4265_get_clk_index(cs4265->sysclk, params_rate(params));
if (index >= 0) {
snd_soc_update_bits(codec, CS4265_ADC_CTL,
- CS4265_ADC_FM, clk_map_table[index].fm_mode);
+ CS4265_ADC_FM, clk_map_table[index].fm_mode << 6);
snd_soc_update_bits(codec, CS4265_MCLK_FREQ,
CS4265_MCLK_FREQ_MASK,
- clk_map_table[index].mclkdiv);
+ clk_map_table[index].mclkdiv << 4);
} else {
dev_err(codec->dev, "can't get correct mclk\n");