Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 620c36ae 编写于 作者: M Mark Brown
浏览文件
操作

Merge branch 'for-3.2' into for-3.3

上级 7cfa467b adf46362
显示空白变更内容
内联 并排
Showing with 5 addition and 5 deletion
sound/soc/codecs/wm9081.c
浏览文件 @ 620c36ae
...@@ -866,7 +866,6 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec, ...@@ -866,7 +866,6 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec,
mdelay(100); mdelay(100);
/* Normal bias enable & soft start off */ /* Normal bias enable & soft start off */
reg |= WM9081_BIAS_ENA;
reg &= ~WM9081_VMID_RAMP; reg &= ~WM9081_VMID_RAMP;
snd_soc_write(codec, WM9081_VMID_CONTROL, reg); snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
...@@ -877,7 +876,7 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec, ...@@ -877,7 +876,7 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec,
} }
/* VMID 2*240k */ /* VMID 2*240k */
reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1); reg = snd_soc_read(codec, WM9081_VMID_CONTROL);
reg &= ~WM9081_VMID_SEL_MASK; reg &= ~WM9081_VMID_SEL_MASK;
reg |= 0x04; reg |= 0x04;
snd_soc_write(codec, WM9081_VMID_CONTROL, reg); snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
...@@ -889,14 +888,15 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec, ...@@ -889,14 +888,15 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
/* Startup bias source */ /* Startup bias source and disable bias */
reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1); reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
reg |= WM9081_BIAS_SRC; reg |= WM9081_BIAS_SRC;
reg &= ~WM9081_BIAS_ENA;
snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg); snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
/* Disable VMID and biases with soft ramping */ /* Disable VMID with soft ramping */
reg = snd_soc_read(codec, WM9081_VMID_CONTROL); reg = snd_soc_read(codec, WM9081_VMID_CONTROL);
reg &= ~(WM9081_VMID_SEL_MASK | WM9081_BIAS_ENA); reg &= ~WM9081_VMID_SEL_MASK;
reg |= WM9081_VMID_RAMP; reg |= WM9081_VMID_RAMP;
snd_soc_write(codec, WM9081_VMID_CONTROL, reg); snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或