aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-20 07:19:43 -0500
committerLuis Henriques <luis.henriques@canonical.com>2012-03-08 07:23:24 -0500
commit9d3b0ebc000255665e705056a3269e247738a459 (patch)
tree9ab061db45e3ce6ae1067918909f1bd09aee662b /sound/soc/codecs
parent8805e305161fc158d313aa56db0ba04a67b05e0f (diff)
ASoC: wm_hubs: Enable line out VMID buffer for single ended line outputs
BugLink: http://bugs.launchpad.net/bugs/931719 commit 77231abe55433aa17eca712718745275853fa66d upstream. For optimal performance the single ended line outputs require that the line output VMID buffer be enabled. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm_hubs.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 9e370d14ad8..1c2a47dcbea 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -589,6 +589,8 @@ SND_SOC_DAPM_INPUT("IN2RP:VXRP"),
589SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0), 589SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0),
590SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0), 590SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0),
591 591
592SND_SOC_DAPM_SUPPLY("LINEOUT_VMID_BUF", WM8993_ANTIPOP1, 7, 0, NULL, 0),
593
592SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0, 594SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0,
593 in1l_pga, ARRAY_SIZE(in1l_pga)), 595 in1l_pga, ARRAY_SIZE(in1l_pga)),
594SND_SOC_DAPM_MIXER("IN1R PGA", WM8993_POWER_MANAGEMENT_2, 4, 0, 596SND_SOC_DAPM_MIXER("IN1R PGA", WM8993_POWER_MANAGEMENT_2, 4, 0,
@@ -794,9 +796,11 @@ static const struct snd_soc_dapm_route lineout1_diff_routes[] = {
794}; 796};
795 797
796static const struct snd_soc_dapm_route lineout1_se_routes[] = { 798static const struct snd_soc_dapm_route lineout1_se_routes[] = {
799 { "LINEOUT1N Mixer", NULL, "LINEOUT_VMID_BUF" },
797 { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" }, 800 { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" },
798 { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" }, 801 { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" },
799 802
803 { "LINEOUT1P Mixer", NULL, "LINEOUT_VMID_BUF" },
800 { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" }, 804 { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" },
801 805
802 { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" }, 806 { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },
@@ -813,9 +817,11 @@ static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
813}; 817};
814 818
815static const struct snd_soc_dapm_route lineout2_se_routes[] = { 819static const struct snd_soc_dapm_route lineout2_se_routes[] = {
820 { "LINEOUT2N Mixer", NULL, "LINEOUT_VMID_BUF" },
816 { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" }, 821 { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },
817 { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" }, 822 { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" },
818 823
824 { "LINEOUT2P Mixer", NULL, "LINEOUT_VMID_BUF" },
819 { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" }, 825 { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" },
820 826
821 { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" }, 827 { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" },