diff options
author | Zidan Wang <zidan.wang@freescale.com> | 2016-01-08 03:57:02 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-08 08:07:29 -0500 |
commit | 2d4a32602bc5d4d8f9a80c6b66a4e28d5f2d4798 (patch) | |
tree | dc3466733ee0a05583e0a01d74ab1fbd43feeb07 /sound | |
parent | defbf708baf2a4cc4421699d02b57d7c3bb728b0 (diff) |
ASoC: wm8960: boost switch should be closed when using L/RINPUT1
L/RINPUT1 can line to Left/Right Boost Mixer through boost switch.
If boost switch is open, there will be no voice when using L/RINPUT1.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8960.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 9e90b8e2b86e..28bfe39b5f34 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c | |||
@@ -413,8 +413,8 @@ static const struct snd_soc_dapm_route audio_paths[] = { | |||
413 | { "Left Boost Mixer", "LINPUT2 Switch", "LINPUT2" }, | 413 | { "Left Boost Mixer", "LINPUT2 Switch", "LINPUT2" }, |
414 | { "Left Boost Mixer", "LINPUT3 Switch", "LINPUT3" }, | 414 | { "Left Boost Mixer", "LINPUT3 Switch", "LINPUT3" }, |
415 | 415 | ||
416 | { "Left Input Mixer", "Boost Switch", "Left Boost Mixer", }, | 416 | { "Left Input Mixer", "Boost Switch", "Left Boost Mixer" }, |
417 | { "Left Input Mixer", NULL, "LINPUT1", }, /* Really Boost Switch */ | 417 | { "Left Input Mixer", "Boost Switch", "LINPUT1" }, /* Really Boost Switch */ |
418 | { "Left Input Mixer", NULL, "LINPUT2" }, | 418 | { "Left Input Mixer", NULL, "LINPUT2" }, |
419 | { "Left Input Mixer", NULL, "LINPUT3" }, | 419 | { "Left Input Mixer", NULL, "LINPUT3" }, |
420 | 420 | ||
@@ -422,8 +422,8 @@ static const struct snd_soc_dapm_route audio_paths[] = { | |||
422 | { "Right Boost Mixer", "RINPUT2 Switch", "RINPUT2" }, | 422 | { "Right Boost Mixer", "RINPUT2 Switch", "RINPUT2" }, |
423 | { "Right Boost Mixer", "RINPUT3 Switch", "RINPUT3" }, | 423 | { "Right Boost Mixer", "RINPUT3 Switch", "RINPUT3" }, |
424 | 424 | ||
425 | { "Right Input Mixer", "Boost Switch", "Right Boost Mixer", }, | 425 | { "Right Input Mixer", "Boost Switch", "Right Boost Mixer" }, |
426 | { "Right Input Mixer", NULL, "RINPUT1", }, /* Really Boost Switch */ | 426 | { "Right Input Mixer", "Boost Switch", "RINPUT1" }, /* Really Boost Switch */ |
427 | { "Right Input Mixer", NULL, "RINPUT2" }, | 427 | { "Right Input Mixer", NULL, "RINPUT2" }, |
428 | { "Right Input Mixer", NULL, "RINPUT3" }, | 428 | { "Right Input Mixer", NULL, "RINPUT3" }, |
429 | 429 | ||
@@ -431,11 +431,11 @@ static const struct snd_soc_dapm_route audio_paths[] = { | |||
431 | { "Right ADC", NULL, "Right Input Mixer" }, | 431 | { "Right ADC", NULL, "Right Input Mixer" }, |
432 | 432 | ||
433 | { "Left Output Mixer", "LINPUT3 Switch", "LINPUT3" }, | 433 | { "Left Output Mixer", "LINPUT3 Switch", "LINPUT3" }, |
434 | { "Left Output Mixer", "Boost Bypass Switch", "Left Boost Mixer"} , | 434 | { "Left Output Mixer", "Boost Bypass Switch", "Left Boost Mixer" }, |
435 | { "Left Output Mixer", "PCM Playback Switch", "Left DAC" }, | 435 | { "Left Output Mixer", "PCM Playback Switch", "Left DAC" }, |
436 | 436 | ||
437 | { "Right Output Mixer", "RINPUT3 Switch", "RINPUT3" }, | 437 | { "Right Output Mixer", "RINPUT3 Switch", "RINPUT3" }, |
438 | { "Right Output Mixer", "Boost Bypass Switch", "Right Boost Mixer" } , | 438 | { "Right Output Mixer", "Boost Bypass Switch", "Right Boost Mixer" }, |
439 | { "Right Output Mixer", "PCM Playback Switch", "Right DAC" }, | 439 | { "Right Output Mixer", "PCM Playback Switch", "Right DAC" }, |
440 | 440 | ||
441 | { "LOUT1 PGA", NULL, "Left Output Mixer" }, | 441 | { "LOUT1 PGA", NULL, "Left Output Mixer" }, |