projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
977732b
345b0f5
)
Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
author
Mark Brown
<broonie@kernel.org>
Fri, 5 Jun 2015 17:54:46 +0000
(18:54 +0100)
committer
Mark Brown
<broonie@kernel.org>
Fri, 5 Jun 2015 17:54:46 +0000
(18:54 +0100)
1
2
sound/soc/codecs/rt5645.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/soc/codecs/rt5645.c
index
5da2937
,
aaede45
..
d5f0f56
---
1
/
sound/soc/codecs/rt5645.c
---
2
/
sound/soc/codecs/rt5645.c
+++ b/
sound/soc/codecs/rt5645.c
@@@
-2520,12
-3062,10
+3061,10
@@@
static int rt5645_probe(struct snd_soc_
break;
}
-
rt5645_set
_bias_level(codec, SND_SOC_BIAS_OFF);
+
snd_soc_codec_force
_bias_level(codec, SND_SOC_BIAS_OFF);
- snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200);
-
/* for JD function */
- if (rt5645->pdata.
en_jd_func
) {
+ if (rt5645->pdata.
jd_mode
) {
snd_soc_dapm_force_enable_pin(&codec->dapm, "JD Power");
snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO2");
snd_soc_dapm_sync(&codec->dapm);