summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm_hubs.c
diff options
context:
space:
mode:
authorMark Brown2011-06-29 09:21:09 +0200
committerMark Brown2011-07-13 17:37:52 +0200
commitb70a51bab9c64d2cabf7c052ebb3f5db2801fd05 (patch)
tree25ce58fdcae4e03c12f6da2c11fdec8462c0a5d0 /sound/soc/codecs/wm_hubs.c
parentASoC: STA32x: Preserve reserved register bits (diff)
downloadkernel-qcow2-linux-b70a51bab9c64d2cabf7c052ebb3f5db2801fd05.tar.gz
kernel-qcow2-linux-b70a51bab9c64d2cabf7c052ebb3f5db2801fd05.tar.xz
kernel-qcow2-linux-b70a51bab9c64d2cabf7c052ebb3f5db2801fd05.zip
ASoC: Use late enable handling for direct voice, speaker and headphone
This ensures appropriate clocking for bypass paths to speaker and headphone and direct voice paths on affected revisions. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm_hubs.c')
-rw-r--r--sound/soc/codecs/wm_hubs.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 2d6c88b68a14..7e60e2279671 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -598,9 +598,6 @@ SND_SOC_DAPM_MIXER("IN2L PGA", WM8993_POWER_MANAGEMENT_2, 7, 0,
SND_SOC_DAPM_MIXER("IN2R PGA", WM8993_POWER_MANAGEMENT_2, 5, 0,
in2r_pga, ARRAY_SIZE(in2r_pga)),
-/* Dummy widgets to represent differential paths */
-SND_SOC_DAPM_PGA("Direct Voice", SND_SOC_NOPM, 0, 0, NULL, 0),
-
SND_SOC_DAPM_MIXER("MIXINL", WM8993_POWER_MANAGEMENT_2, 9, 0,
mixinl, ARRAY_SIZE(mixinl)),
SND_SOC_DAPM_MIXER("MIXINR", WM8993_POWER_MANAGEMENT_2, 8, 0,