summaryrefslogtreecommitdiff
path: root/sound/soc/tegra/tegra_aic326x.c
diff options
context:
space:
mode:
authorNikesh Oswal <noswal@nvidia.com>2012-02-07 07:24:02 -0800
committerLokesh Pathak <lpathak@nvidia.com>2012-02-23 05:04:26 -0800
commit9480ce361016f27358b3f05967d92cdca06e183e (patch)
tree79c36ec54b609e9f6d71c9b64eb2d95b170bbc46 /sound/soc/tegra/tegra_aic326x.c
parent20f6253c5602a356a919c82fa7a875586a523a41 (diff)
asoc: tegra: aic326x: add dapm route for capture path
Change-Id: I433c35f2ada14f273f85d67f8cf18612bd1e72ea Signed-off-by: Nikesh Oswal <noswal@nvidia.com> Reviewed-on: http://git-master/r/84531 Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound/soc/tegra/tegra_aic326x.c')
-rw-r--r--sound/soc/tegra/tegra_aic326x.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/sound/soc/tegra/tegra_aic326x.c b/sound/soc/tegra/tegra_aic326x.c
index d04d6ee053ce..78dc3fb47add 100644
--- a/sound/soc/tegra/tegra_aic326x.c
+++ b/sound/soc/tegra/tegra_aic326x.c
@@ -776,7 +776,7 @@ static const struct snd_soc_dapm_widget tegra_aic326x_dapm_widgets[] = {
SND_SOC_DAPM_MIC("Mic Jack", NULL),
SND_SOC_DAPM_INPUT("Ext Mic"),
SND_SOC_DAPM_LINE("Linein", NULL),
- SND_SOC_DAPM_INPUT("Int Mic"),
+ SND_SOC_DAPM_MIC("Int Mic", NULL),
};
static const struct snd_soc_dapm_route aic326x_audio_map[] = {
@@ -786,16 +786,19 @@ static const struct snd_soc_dapm_route aic326x_audio_map[] = {
{"Earpiece", NULL, "RECM"},
{"Headphone Jack", NULL, "HPL"},
{"Headphone Jack", NULL, "HPR"},
- {"IN2L", NULL, "Mic Jack"},
- /*TODO correct */
- /* external mic is stero */
- {"IN2L", NULL, "Ext Mic"},
- {"IN2R", NULL, "Ext Mic"},
+ /* internal (IN2L/IN2R) mic is stero */
+ {"Mic Bias Ext" ,NULL, "Int Mic"},
+ {"IN2L", NULL, "Mic Bias Ext"},
+ {"Mic Bias Ext" ,NULL, "Int Mic"},
+ {"IN2R", NULL, "Mic Bias Ext"},
/* Line in */
- {"IN2L", NULL, "Linein"},
- {"IN2R", NULL, "Linein"},
- /* Internal MIC */
- {"IN1L", NULL, "Int Mic"},
+ //{"IN2L", NULL, "Linein"},
+ //{"IN2R", NULL, "Linein"},
+ /* Headset (IN1L) MIC */
+ {"Mic Bias Int" ,NULL, "Mic Jack"},
+ {"CM1L" ,NULL, "Mic Jack"},
+ {"IN1L", NULL, "Mic Bias Int"},
+ {"IN1L", NULL, "CM1L"},
};
static const struct snd_kcontrol_new tegra_aic326x_controls[] = {