malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/fix/wm8737', 'asoc/fix/wm8903' and 'asoc/fix/wm8955' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown 2015-06-05 18:54:43 +01:00
commit f1363c40c7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/wm8737.c
View File

@ -483,7 +483,8 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
/* Fast VMID ramp at 2*2.5k */ /* Fast VMID ramp at 2*2.5k */
snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL, snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
WM8737_VMIDSEL_MASK, 0x4); WM8737_VMIDSEL_MASK,
2 << WM8737_VMIDSEL_SHIFT);
/* Bring VMID up */ /* Bring VMID up */
snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT, snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT,
@ -497,7 +498,8 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
/* VMID at 2*300k */ /* VMID at 2*300k */
snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL, snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
WM8737_VMIDSEL_MASK, 2); WM8737_VMIDSEL_MASK,
1 << WM8737_VMIDSEL_SHIFT);
break; break;

2
sound/soc/codecs/wm8903.h
View File

@ -172,7 +172,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec,
#define WM8903_VMID_BUF_ENA_WIDTH 1 /* VMID_BUF_ENA */ #define WM8903_VMID_BUF_ENA_WIDTH 1 /* VMID_BUF_ENA */
#define WM8903_VMID_RES_50K 2 #define WM8903_VMID_RES_50K 2
#define WM8903_VMID_RES_250K 3 #define WM8903_VMID_RES_250K 4
#define WM8903_VMID_RES_5K 6 #define WM8903_VMID_RES_5K 6
/* /*

2
sound/soc/codecs/wm8955.c
View File

@ -298,7 +298,7 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec)
snd_soc_update_bits(codec, WM8955_PLL_CONTROL_2, snd_soc_update_bits(codec, WM8955_PLL_CONTROL_2,
WM8955_K_17_9_MASK, WM8955_K_17_9_MASK,
(pll.k >> 9) & WM8955_K_17_9_MASK); (pll.k >> 9) & WM8955_K_17_9_MASK);
snd_soc_update_bits(codec, WM8955_PLL_CONTROL_2, snd_soc_update_bits(codec, WM8955_PLL_CONTROL_3,
WM8955_K_8_0_MASK, WM8955_K_8_0_MASK,
pll.k & WM8955_K_8_0_MASK); pll.k & WM8955_K_8_0_MASK);
if (pll.k) if (pll.k)