Commit 0b664b22 authored May 10, 2015 by Axel Lin Committed by Sasha Levin Jul 03, 2015

ASoC: wm8737: Fixup setting VMID Impedance control register



[ Upstream commit 14ba3ec1de043260cecd9e828ea2e3a0ad302893 ]

According to the datasheet:
R10 (0Ah) VMID Impedance Control

BIT 3:2 VMIDSEL DEFAULT 00

DESCRIPTION: VMID impedance selection control
00: 75kΩ output
01: 300kΩ output
10: 2.5kΩ output

WM8737_VMIDSEL_MASK is 0xC (VMIDSEL - [3:2]),
so it needs to left shift WM8737_VMIDSEL_SHIFT bits for setting these bits.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent c1610d2c

sound/soc/codecs/wm8737.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -494,7 +494,8 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,

		/* Fast VMID ramp at 22.5k /
		snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
		WM8737_VMIDSEL_MASK, 0x4);
		WM8737_VMIDSEL_MASK,
		2 << WM8737_VMIDSEL_SHIFT);

		/* Bring VMID up */
		snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT,
		@@ -508,7 +509,8 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,

		/* VMID at 2300k /
		snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
		WM8737_VMIDSEL_MASK, 2);
		WM8737_VMIDSEL_MASK,
		1 << WM8737_VMIDSEL_SHIFT);

		break;