diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-04-24 12:41:32 +0300 |
|---|---|---|
| committer | Liam Girdwood <lrg@ti.com> | 2012-05-22 17:33:19 +0100 |
| commit | 7d09f9e98956b29755f20d830252dec9300e7044 (patch) | |
| tree | 502a7b1ba8060e6c05fd617ac49702e8fa78b9cb | |
| parent | c2f98956e3635a897737cc08a60539752aa00dd7 (diff) | |
| download | linux-stable-7d09f9e98956b29755f20d830252dec9300e7044.tar.gz linux-stable-7d09f9e98956b29755f20d830252dec9300e7044.tar.bz2 linux-stable-7d09f9e98956b29755f20d830252dec9300e7044.zip | |
ASoC: omap-abe-twl6040: Move Digital Mic widget into dapm table
The needed change in routing will be done runtime for the non
twl6040 connected widgets, like the Digital microphone.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
| -rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 31ab6fee8943..4388de9b81f2 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -128,6 +128,9 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { SND_SOC_DAPM_MIC("Main Handset Mic", NULL), SND_SOC_DAPM_MIC("Sub Handset Mic", NULL), SND_SOC_DAPM_LINE("Line In", NULL), + + /* Digital microphones */ + SND_SOC_DAPM_MIC("Digital Mic", NULL), }; static const struct snd_soc_dapm_route audio_map[] = { @@ -210,10 +213,6 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) return ret; } -static const struct snd_soc_dapm_widget dmic_dapm_widgets[] = { - SND_SOC_DAPM_MIC("Digital Mic", NULL), -}; - static const struct snd_soc_dapm_route dmic_audio_map[] = { {"DMic", NULL, "Digital Mic"}, {"Digital Mic", NULL, "Digital Mic1 Bias"}, @@ -223,12 +222,6 @@ static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; - int ret; - - ret = snd_soc_dapm_new_controls(dapm, dmic_dapm_widgets, - ARRAY_SIZE(dmic_dapm_widgets)); - if (ret) - return ret; return snd_soc_dapm_add_routes(dapm, dmic_audio_map, ARRAY_SIZE(dmic_audio_map)); |