summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-04-23 06:31:22 +0800
committerAndy Green <andy.green@linaro.org>2012-06-13 21:27:45 +0800
commitd560bb363543c4182f141043195963a27b5d3c74 (patch)
treec98f5b4c45d780afc7261317db37e03538c07e2d /sound
parent2b301fc9756ecaf3c1f29613dec63b2ad55e1d7e (diff)
ASoC: twl6040: Fix legacy playback, and capture
In order to get the legacy mode working (to DAPM power on the path) we need to connect the legacy stream name to the DACs of the codec. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/twl6040.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index ee76fd25b0b8..f59076d9d76c 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -824,7 +824,9 @@ static const struct snd_soc_dapm_route intercon[] = {
{"ADC Left", NULL, "MicAmpL"},
{"ADC Right", NULL, "MicAmpR"},
{"PDM Capture", NULL, "ADC Left"},
+ {"Legacy Capture", NULL, "ADC Left"},
{"PDM Capture", NULL, "ADC Right"},
+ {"Legacy Capture", NULL, "ADC Right"},
/* AFM path */
{"AFMAmpL", NULL, "AFML"},
@@ -834,10 +836,12 @@ static const struct snd_soc_dapm_route intercon[] = {
{"HSDAC Right", NULL, "HSDAC Power"},
{"HSDAC Left", NULL, "Headset Playback"},
+ {"HSDAC Left", NULL, "Legacy Playback"},
{"Headset Left Playback", "HS DAC", "HSDAC Left"},
{"Headset Left Playback", "Line-In amp", "AFMAmpL"},
{"HSDAC Right", NULL, "Headset Playback"},
+ {"HSDAC Right", NULL, "Legacy Playback"},
{"Headset Right Playback", "HS DAC", "HSDAC Right"},
{"Headset Right Playback", "Line-In amp", "AFMAmpR"},
@@ -853,10 +857,12 @@ static const struct snd_soc_dapm_route intercon[] = {
{"EP", NULL, "Earphone Driver"},
{"HFDAC Left", NULL, "Handsfree Playback"},
+ {"HFDAC Left", NULL, "Legacy Playback"},
{"Handsfree Left Playback", "HF DAC", "HFDAC Left"},
{"Handsfree Left Playback", "Line-In amp", "AFMAmpL"},
{"HFDAC Right", NULL, "Handsfree Playback"},
+ {"HFDAC Right", NULL, "Legacy Playback"},
{"Handsfree Right Playback", "HF DAC", "HFDAC Right"},
{"Handsfree Right Playback", "Line-In amp", "AFMAmpR"},
@@ -877,6 +883,7 @@ static const struct snd_soc_dapm_route intercon[] = {
/* Vibrator paths */
{"VIBRA DAC", NULL, "Vibra Playback"},
+ {"VIBRA DAC", NULL, "Legacy Playback"},
{"Vibra Left Playback", "Audio PDM", "VIBRA DAC"},
{"Vibra Right Playback", "Audio PDM", "VIBRA DAC"},