summaryrefslogtreecommitdiff
path: root/sound/soc/tegra/tegra_wm8753.c
diff options
context:
space:
mode:
authorNikesh Oswal <noswal@nvidia.com>2011-10-10 19:55:54 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:17 -0800
commita9355477df9ef91849362fb176c990c69967bb93 (patch)
tree9703e4f7dfcbe7adde85ab0a4ddac44a0396bea8 /sound/soc/tegra/tegra_wm8753.c
parent179b143b942abdea138f1d71deb9377bedefbc67 (diff)
asoc: tegra: wm8753: correct dapm map and route entries
Bug: 862023 Change-Id: I8e7e1ad90e0a38bd3380d1b4c3cabd6751906288 Signed-off-by: Nikesh Oswal <noswal@nvidia.com> Reviewed-on: http://git-master/r/57050 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: R6e5a92f713a6efd6539857ec0e0dea8881ca6553
Diffstat (limited to 'sound/soc/tegra/tegra_wm8753.c')
-rw-r--r--sound/soc/tegra/tegra_wm8753.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index 4dc3b7dc80ae..c80160e8438f 100644
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -189,7 +189,7 @@ static int tegra_wm8753_event_hp(struct snd_soc_dapm_widget *w,
static const struct snd_soc_dapm_widget tegra_wm8753_dapm_widgets[] = {
SND_SOC_DAPM_SPK("Int Spk", tegra_wm8753_event_int_spk),
- SND_SOC_DAPM_OUTPUT("Earpiece"),
+ SND_SOC_DAPM_HP("Earpiece", NULL),
SND_SOC_DAPM_OUTPUT("Mono Out"),
SND_SOC_DAPM_HP("Headphone Jack", tegra_wm8753_event_hp),
SND_SOC_DAPM_MIC("Mic Jack", NULL),
@@ -198,14 +198,15 @@ static const struct snd_soc_dapm_widget tegra_wm8753_dapm_widgets[] = {
};
static const struct snd_soc_dapm_route whistler_audio_map[] = {
- {"Int Spk", NULL, "ROUT1"},
- {"Int Spk", NULL, "LOUT1"},
- {"Earpiece", NULL, "ROUT2"},
- {"Earpiece", NULL, "LOUT2"},
+ {"Int Spk", NULL, "ROUT2"},
+ {"Int Spk", NULL, "LOUT2"},
+ {"Earpiece", NULL, "OUT3"},
+ {"Earpiece", NULL, "LOUT1"},
{"Mono Out", NULL, "MONO1"},
{"Mono Out", NULL, "MONO2"},
{"Headphone Jack", NULL, "ROUT1"},
{"Headphone Jack", NULL, "LOUT1"},
+ {"Headphone Jack", NULL, "OUT4"},
{"Mic Bias", NULL, "Mic Jack"},
{"MIC1", NULL, "Mic Bias"},
{"Mic Bias", NULL, "Int Mic"},