diff mbox

ASoC: tegra: support a Mic Jack in the Tegra+RT5640 machine driver

Message ID 1376511989-28187-1-git-send-email-swarren@wwwdotorg.org
State Not Applicable, archived
Headers show

Commit Message

Stephen Warren Aug. 14, 2013, 8:26 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

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>
---
 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt | 1 +
 sound/soc/tegra/tegra_rt5640.c                                        | 1 +
 2 files changed, 2 insertions(+)

Comments

Mark Brown Aug. 15, 2013, 10:08 a.m. UTC | #1 
On Wed, Aug 14, 2013 at 02:26:29PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> 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.

Applied, thanks.
diff mbox

Patch

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[] = {