Skip to content

Commit

Permalink
ASoC: tegra: Add sink for the internal mic to tegra_max98090
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomeu Vizoso authored and Mark Brown committed Mar 2, 2015
1 parent a0cf43e commit 3a4562f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Required properties:
* Headphones
* Speakers
* Mic Jack
* Int Mic

- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
connected to the CODEC.
Expand Down
2 changes: 2 additions & 0 deletions sound/soc/tegra/tegra_max98090.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,13 @@ static const struct snd_soc_dapm_widget tegra_max98090_dapm_widgets[] = {
SND_SOC_DAPM_HP("Headphones", NULL),
SND_SOC_DAPM_SPK("Speakers", NULL),
SND_SOC_DAPM_MIC("Mic Jack", NULL),
SND_SOC_DAPM_MIC("Int Mic", NULL),
};

static const struct snd_kcontrol_new tegra_max98090_controls[] = {
SOC_DAPM_PIN_SWITCH("Headphones"),
SOC_DAPM_PIN_SWITCH("Speakers"),
SOC_DAPM_PIN_SWITCH("Int Mic"),
};

static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
Expand Down

0 comments on commit 3a4562f

Please sign in to comment.