aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm_hubs.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm_hubs.c')
-rw-r--r--sound/soc/codecs/wm_hubs.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 48e61e912400..2a61094075f8 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -17,7 +17,6 @@
17#include <linux/delay.h> 17#include <linux/delay.h>
18#include <linux/pm.h> 18#include <linux/pm.h>
19#include <linux/i2c.h> 19#include <linux/i2c.h>
20#include <linux/platform_device.h>
21#include <linux/mfd/wm8994/registers.h> 20#include <linux/mfd/wm8994/registers.h>
22#include <sound/core.h> 21#include <sound/core.h>
23#include <sound/pcm.h> 22#include <sound/pcm.h>
@@ -611,8 +610,8 @@ SND_SOC_DAPM_INPUT("IN1RP"),
611SND_SOC_DAPM_INPUT("IN2RN"), 610SND_SOC_DAPM_INPUT("IN2RN"),
612SND_SOC_DAPM_INPUT("IN2RP:VXRP"), 611SND_SOC_DAPM_INPUT("IN2RP:VXRP"),
613 612
614SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0), 613SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0, NULL, 0),
615SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0), 614SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0, NULL, 0),
616 615
617SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0, 616SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0,
618 in1l_pga, ARRAY_SIZE(in1l_pga)), 617 in1l_pga, ARRAY_SIZE(in1l_pga)),
@@ -654,6 +653,7 @@ SND_SOC_DAPM_MIXER("SPKL Boost", SND_SOC_NOPM, 0, 0,
654SND_SOC_DAPM_MIXER("SPKR Boost", SND_SOC_NOPM, 0, 0, 653SND_SOC_DAPM_MIXER("SPKR Boost", SND_SOC_NOPM, 0, 0,
655 right_speaker_boost, ARRAY_SIZE(right_speaker_boost)), 654 right_speaker_boost, ARRAY_SIZE(right_speaker_boost)),
656 655
656SND_SOC_DAPM_SUPPLY("TSHUT", WM8993_POWER_MANAGEMENT_2, 14, 0, NULL, 0),
657SND_SOC_DAPM_PGA("SPKL Driver", WM8993_POWER_MANAGEMENT_1, 12, 0, 657SND_SOC_DAPM_PGA("SPKL Driver", WM8993_POWER_MANAGEMENT_1, 12, 0,
658 NULL, 0), 658 NULL, 0),
659SND_SOC_DAPM_PGA("SPKR Driver", WM8993_POWER_MANAGEMENT_1, 13, 0, 659SND_SOC_DAPM_PGA("SPKR Driver", WM8993_POWER_MANAGEMENT_1, 13, 0,
@@ -789,10 +789,12 @@ static const struct snd_soc_dapm_route analogue_routes[] = {
789 { "SPKL Driver", NULL, "VMID" }, 789 { "SPKL Driver", NULL, "VMID" },
790 { "SPKL Driver", NULL, "SPKL Boost" }, 790 { "SPKL Driver", NULL, "SPKL Boost" },
791 { "SPKL Driver", NULL, "CLK_SYS" }, 791 { "SPKL Driver", NULL, "CLK_SYS" },
792 { "SPKL Driver", NULL, "TSHUT" },
792 793
793 { "SPKR Driver", NULL, "VMID" }, 794 { "SPKR Driver", NULL, "VMID" },
794 { "SPKR Driver", NULL, "SPKR Boost" }, 795 { "SPKR Driver", NULL, "SPKR Boost" },
795 { "SPKR Driver", NULL, "CLK_SYS" }, 796 { "SPKR Driver", NULL, "CLK_SYS" },
797 { "SPKR Driver", NULL, "TSHUT" },
796 798
797 { "SPKOUTLP", NULL, "SPKL Driver" }, 799 { "SPKOUTLP", NULL, "SPKL Driver" },
798 { "SPKOUTLN", NULL, "SPKL Driver" }, 800 { "SPKOUTLN", NULL, "SPKL Driver" },