summaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorStephen Warren2013-08-14 22:26:29 +0200
committerMark Brown2013-08-15 12:08:30 +0200
commit7ac0da8cd38cb09d0addf708a8abbb93cf325c68 (patch)
treea25934276c7f1ad371020d6434de70f3cc2d1570 /sound/soc/tegra
parentASoC: dt: Move ALC5632 pin list from Tegra board binding to CODEC binding (diff)
downloadkernel-qcow2-linux-7ac0da8cd38cb09d0addf708a8abbb93cf325c68.tar.gz
kernel-qcow2-linux-7ac0da8cd38cb09d0addf708a8abbb93cf325c68.tar.xz
kernel-qcow2-linux-7ac0da8cd38cb09d0addf708a8abbb93cf325c68.zip
ASoC: tegra: support a Mic Jack in the Tegra+RT5640 machine driver
Add a Mic Jack widget to the Tegra+RT5640 machine driver, and document this in the DT binding. This enables the DT to include the Mic Jack in the audio routing table, and hence enables capture of audio, in addition to the previously-working playback. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra_rt5640.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index 08794f915a94..4511c5a875ec 100644
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -99,6 +99,7 @@ static struct snd_soc_jack_gpio tegra_rt5640_hp_jack_gpio = {
static const struct snd_soc_dapm_widget tegra_rt5640_dapm_widgets[] = {
SND_SOC_DAPM_HP("Headphones", NULL),
SND_SOC_DAPM_SPK("Speakers", NULL),
+ SND_SOC_DAPM_MIC("Mic Jack", NULL),
};
static const struct snd_kcontrol_new tegra_rt5640_controls[] = {