diff options
author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2015-02-12 03:41:56 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-02 12:26:28 -0500 |
commit | 3a4562f756617b4b210fc487bfe23853a450d3c1 (patch) | |
tree | 59871e32bb98383efde5479de038348fcb2881e0 /sound/soc/tegra | |
parent | a0cf43e2f0f391dad7882febbf04423e73e3ff99 (diff) |
ASoC: tegra: Add sink for the internal mic to tegra_max98090
Also adds a control for the pin of the internal mic, so userspace can
apply policy when the state of the external mic jack changes.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r-- | sound/soc/tegra/tegra_max98090.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index 8df71a436f11..29ea87cd852e 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c | |||
@@ -133,11 +133,13 @@ static const struct snd_soc_dapm_widget tegra_max98090_dapm_widgets[] = { | |||
133 | SND_SOC_DAPM_HP("Headphones", NULL), | 133 | SND_SOC_DAPM_HP("Headphones", NULL), |
134 | SND_SOC_DAPM_SPK("Speakers", NULL), | 134 | SND_SOC_DAPM_SPK("Speakers", NULL), |
135 | SND_SOC_DAPM_MIC("Mic Jack", NULL), | 135 | SND_SOC_DAPM_MIC("Mic Jack", NULL), |
136 | SND_SOC_DAPM_MIC("Int Mic", NULL), | ||
136 | }; | 137 | }; |
137 | 138 | ||
138 | static const struct snd_kcontrol_new tegra_max98090_controls[] = { | 139 | static const struct snd_kcontrol_new tegra_max98090_controls[] = { |
139 | SOC_DAPM_PIN_SWITCH("Headphones"), | 140 | SOC_DAPM_PIN_SWITCH("Headphones"), |
140 | SOC_DAPM_PIN_SWITCH("Speakers"), | 141 | SOC_DAPM_PIN_SWITCH("Speakers"), |
142 | SOC_DAPM_PIN_SWITCH("Int Mic"), | ||
141 | }; | 143 | }; |
142 | 144 | ||
143 | static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) | 145 | static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) |