diff options
| author | Ravindra Lokhande <rlokhande@nvidia.com> | 2012-02-01 19:58:41 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-13 07:20:55 -0800 |
| commit | e8dc4bd80bf2a31b46bf2bad034dcd514c1e11f5 (patch) | |
| tree | 8843ce0bf9e00bad52feeeb7d29f3fa32590f4ff /sound | |
| parent | de89439fae4a846c786e4fcd68f493cd7a9c4bca (diff) | |
ASoC: tegra: add capture path
added Line In and digital and analog mic to capture path.
Signed-off-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-on: http://git-master/r/78752
(cherry picked from commit 832552a5751502eaf1d3d917368c8d889badb353)
Change-Id: I6304aa179a989becbfc3bf6b85e42d28fdbaabf9
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/82712
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_max98095.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/tegra/tegra_max98095.c b/sound/soc/tegra/tegra_max98095.c index e71691d80b45..2104ba849cd3 100644 --- a/sound/soc/tegra/tegra_max98095.c +++ b/sound/soc/tegra/tegra_max98095.c @@ -422,31 +422,31 @@ static int tegra_max98095_event_hp(struct snd_soc_dapm_widget *w, static const struct snd_soc_dapm_widget tegra_max98095_dapm_widgets[] = { SND_SOC_DAPM_SPK("Int Spk", tegra_max98095_event_int_spk), - SND_SOC_DAPM_OUTPUT("Earpiece"), SND_SOC_DAPM_HP("Headphone Jack", tegra_max98095_event_hp), SND_SOC_DAPM_MIC("Mic Jack", NULL), SND_SOC_DAPM_INPUT("Int Mic"), + SND_SOC_DAPM_LINE("Line In", NULL), }; static const struct snd_soc_dapm_route enterprise_audio_map[] = { {"Int Spk", NULL, "SPKL"}, {"Int Spk", NULL, "SPKR"}, - {"Earpiece", NULL, "RECL"}, - {"Earpiece", NULL, "RECR"}, {"Headphone Jack", NULL, "HPL"}, {"Headphone Jack", NULL, "HPR"}, - {"MICBIAS", NULL, "Mic Jack"}, - {"MIC2", NULL, "MICBIAS"}, - {"MICBIAS", NULL, "Int Mic"}, - {"MIC1", NULL, "MICBIAS"}, + {"MICBIAS2", NULL, "Mic Jack"}, + {"MIC2", NULL, "MICBIAS2"}, + {"MIC1", NULL, "Int Mic"}, + {"MIC1", NULL, "MICBIAS1"}, + {"INB1", NULL, "Line In"}, + {"INB2", NULL, "Line In"}, }; static const struct snd_kcontrol_new tegra_max98095_controls[] = { SOC_DAPM_PIN_SWITCH("Int Spk"), - SOC_DAPM_PIN_SWITCH("Earpiece"), SOC_DAPM_PIN_SWITCH("Headphone Jack"), SOC_DAPM_PIN_SWITCH("Mic Jack"), SOC_DAPM_PIN_SWITCH("Int Mic"), + SOC_DAPM_PIN_SWITCH("LineIn"), }; static int tegra_max98095_init(struct snd_soc_pcm_runtime *rtd) |