summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-07 14:29:43 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-07 14:29:43 +0800
commitf73c06dc2cbf1ddf1c92f05f9843f923c8c69529 (patch)
tree2c8ef896f4dac181dc2c0a0d34745667e3f140ce /sound
parentde83fb38df2c1418fb7385248d797d3046c5512c (diff)
parent44426de4d87682870b35a649b76586177113f5e7 (diff)
downloadop-kernel-dev-f73c06dc2cbf1ddf1c92f05f9843f923c8c69529.zip
op-kernel-dev-f73c06dc2cbf1ddf1c92f05f9843f923c8c69529.tar.gz
Merge remote-tracking branch 'asoc/fix/wm8960' into tmp
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8960.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 9bb9273..a64b934 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -53,8 +53,8 @@
* using 2 wire for device control, so we cache them instead.
*/
static const struct reg_default wm8960_reg_defaults[] = {
- { 0x0, 0x0097 },
- { 0x1, 0x0097 },
+ { 0x0, 0x00a7 },
+ { 0x1, 0x00a7 },
{ 0x2, 0x0000 },
{ 0x3, 0x0000 },
{ 0x4, 0x0000 },
@@ -323,8 +323,8 @@ SND_SOC_DAPM_MIXER("Left Input Mixer", WM8960_POWER3, 5, 0,
SND_SOC_DAPM_MIXER("Right Input Mixer", WM8960_POWER3, 4, 0,
wm8960_rin, ARRAY_SIZE(wm8960_rin)),
-SND_SOC_DAPM_ADC("Left ADC", "Capture", WM8960_POWER2, 3, 0),
-SND_SOC_DAPM_ADC("Right ADC", "Capture", WM8960_POWER2, 2, 0),
+SND_SOC_DAPM_ADC("Left ADC", "Capture", WM8960_POWER1, 3, 0),
+SND_SOC_DAPM_ADC("Right ADC", "Capture", WM8960_POWER1, 2, 0),
SND_SOC_DAPM_DAC("Left DAC", "Playback", WM8960_POWER2, 8, 0),
SND_SOC_DAPM_DAC("Right DAC", "Playback", WM8960_POWER2, 7, 0),
OpenPOWER on IntegriCloud