diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-08-14 14:26:29 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:08:30 +0100 |
| commit | 7ac0da8cd38cb09d0addf708a8abbb93cf325c68 (patch) | |
| tree | a25934276c7f1ad371020d6434de70f3cc2d1570 | |
| parent | 81164e61c12d597a8aeea3313188da97223466aa (diff) | |
| download | op-kernel-dev-7ac0da8cd38cb09d0addf708a8abbb93cf325c68.zip op-kernel-dev-7ac0da8cd38cb09d0addf708a8abbb93cf325c68.tar.gz | |
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>
| -rw-r--r-- | Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt | 1 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt index cba4f88..dc62249 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt @@ -16,6 +16,7 @@ Required properties: * Headphones * Speakers + * Mic Jack - nvidia,i2s-controller : The phandle of the Tegra I2S controller that's connected to the CODEC. diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 08794f9..4511c5a 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[] = { |
