summaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-01-13 15:22:08 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-14 12:30:40 +0000
commit62ffac4d70ed996d303da0ac8e32c89b9810115c (patch)
tree2efde36018fef43f475da7b5e80f0e9575569c22 /sound/soc/tegra
parentb0ee5fbab742d234f87c0186a5cae2aba85ba7a7 (diff)
downloadop-kernel-dev-62ffac4d70ed996d303da0ac8e32c89b9810115c.zip
op-kernel-dev-62ffac4d70ed996d303da0ac8e32c89b9810115c.tar.gz
ASoC: tegra: Add DAPM widgets/routes for Harmony
With this change, I can capture from a microphone plugged into the mic jack on Harmony (after unmuting Left Input PGA, and maybe turning up the gain there too). Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/harmony.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c
index bf0dbaf..b160b71 100644
--- a/sound/soc/tegra/harmony.c
+++ b/sound/soc/tegra/harmony.c
@@ -107,6 +107,36 @@ static struct snd_soc_ops harmony_asoc_ops = {
.hw_params = harmony_asoc_hw_params,
};
+static const struct snd_soc_dapm_widget harmony_dapm_widgets[] = {
+ SND_SOC_DAPM_HP("Headphone Jack", NULL),
+ SND_SOC_DAPM_MIC("Mic Jack", NULL),
+};
+
+static const struct snd_soc_dapm_route harmony_audio_map[] = {
+ {"Headphone Jack", NULL, "HPOUTR"},
+ {"Headphone Jack", NULL, "HPOUTL"},
+ {"Mic Bias", NULL, "Mic Jack"},
+ {"IN1L", NULL, "Mic Bias"},
+};
+
+static int harmony_asoc_init(struct snd_soc_pcm_runtime *rtd)
+{
+ struct snd_soc_codec *codec = rtd->codec;
+ struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+ snd_soc_dapm_new_controls(dapm, harmony_dapm_widgets,
+ ARRAY_SIZE(harmony_dapm_widgets));
+
+ snd_soc_dapm_add_routes(dapm, harmony_audio_map,
+ ARRAY_SIZE(harmony_audio_map));
+
+ snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+ snd_soc_dapm_enable_pin(dapm, "Mic Jack");
+ snd_soc_dapm_sync(dapm);
+
+ return 0;
+}
+
static struct snd_soc_dai_link harmony_wm8903_dai = {
.name = "WM8903",
.stream_name = "WM8903 PCM",
@@ -114,6 +144,7 @@ static struct snd_soc_dai_link harmony_wm8903_dai = {
.platform_name = "tegra-pcm-audio",
.cpu_dai_name = "tegra-i2s.0",
.codec_dai_name = "wm8903-hifi",
+ .init = harmony_asoc_init,
.ops = &harmony_asoc_ops,
};
OpenPOWER on IntegriCloud