aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-01-13 17:22:08 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-14 07:30:40 -0500
commit62ffac4d70ed996d303da0ac8e32c89b9810115c (patch)
tree2efde36018fef43f475da7b5e80f0e9575569c22
parentb0ee5fbab742d234f87c0186a5cae2aba85ba7a7 (diff)
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>
-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 bf0dbafbf6d0..b160b7113f45 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 = {
107 .hw_params = harmony_asoc_hw_params, 107 .hw_params = harmony_asoc_hw_params,
108}; 108};
109 109
110static const struct snd_soc_dapm_widget harmony_dapm_widgets[] = {
111 SND_SOC_DAPM_HP("Headphone Jack", NULL),
112 SND_SOC_DAPM_MIC("Mic Jack", NULL),
113};
114
115static const struct snd_soc_dapm_route harmony_audio_map[] = {
116 {"Headphone Jack", NULL, "HPOUTR"},
117 {"Headphone Jack", NULL, "HPOUTL"},
118 {"Mic Bias", NULL, "Mic Jack"},
119 {"IN1L", NULL, "Mic Bias"},
120};
121
122static int harmony_asoc_init(struct snd_soc_pcm_runtime *rtd)
123{
124 struct snd_soc_codec *codec = rtd->codec;
125 struct snd_soc_dapm_context *dapm = &codec->dapm;
126
127 snd_soc_dapm_new_controls(dapm, harmony_dapm_widgets,
128 ARRAY_SIZE(harmony_dapm_widgets));
129
130 snd_soc_dapm_add_routes(dapm, harmony_audio_map,
131 ARRAY_SIZE(harmony_audio_map));
132
133 snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
134 snd_soc_dapm_enable_pin(dapm, "Mic Jack");
135 snd_soc_dapm_sync(dapm);
136
137 return 0;
138}
139
110static struct snd_soc_dai_link harmony_wm8903_dai = { 140static struct snd_soc_dai_link harmony_wm8903_dai = {
111 .name = "WM8903", 141 .name = "WM8903",
112 .stream_name = "WM8903 PCM", 142 .stream_name = "WM8903 PCM",
@@ -114,6 +144,7 @@ static struct snd_soc_dai_link harmony_wm8903_dai = {
114 .platform_name = "tegra-pcm-audio", 144 .platform_name = "tegra-pcm-audio",
115 .cpu_dai_name = "tegra-i2s.0", 145 .cpu_dai_name = "tegra-i2s.0",
116 .codec_dai_name = "wm8903-hifi", 146 .codec_dai_name = "wm8903-hifi",
147 .init = harmony_asoc_init,
117 .ops = &harmony_asoc_ops, 148 .ops = &harmony_asoc_ops,
118}; 149};
119 150