From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org,
"Lars-Peter Clausen" <lars@metafoo.de>,
"Ryan Mallon" <rmallon@gmail.com>,
"Vinod Koul" <vinod.koul@intel.com>,
"Peter Ujfalusi" <peter.ujfalusi@ti.com>,
"Daniel Glöckner" <daniel-gl@gmx.net>,
"Benoit Cousson" <bcousson@baylibre.com>,
"Jarkko Nikula" <jarkko.nikula@bitmer.com>
Subject: [PATCH v2 04/12] ASoC: omap-abe-twl6040: Register machine level DMIC DAPM routes with the card
Date: Wed, 12 Mar 2014 15:27:32 +0100 [thread overview]
Message-ID: <1394634460-15889-5-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1394634460-15889-1-git-send-email-lars@metafoo.de>
Machine level DAPM widgets and routes should be registered in the card's DAPM
context, rather than in the CODEC's context.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
Changes since v1:
* Only register DMIC DAPM routes with the card, do not join the two routes
tables into one.
---
sound/soc/omap/omap-abe-twl6040.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index ebb1390..024dafc 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -203,8 +203,7 @@ static const struct snd_soc_dapm_route dmic_audio_map[] = {
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;
+ struct snd_soc_dapm_context *dapm = &rtd->card->dapm;
return snd_soc_dapm_add_routes(dapm, dmic_audio_map,
ARRAY_SIZE(dmic_audio_map));
--
1.8.0
next prev parent reply other threads:[~2014-03-12 14:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 14:27 [PATCH v2 00/12] Cleanup card DAPM and control setup Lars-Peter Clausen
2014-03-12 14:27 ` [PATCH v2 01/12] ASoC: ams-delta: Fix compile error Lars-Peter Clausen
2014-03-12 14:27 ` [PATCH v2 02/12] ASoC: ams-delta: Convert to table based DAPM and control setup Lars-Peter Clausen
2014-03-21 18:03 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 03/12] ASoC: mfld_machine: " Lars-Peter Clausen
2014-03-21 18:04 ` Mark Brown
2014-03-12 14:27 ` Lars-Peter Clausen [this message]
2014-03-13 10:06 ` [PATCH v2 04/12] ASoC: omap-abe-twl6040: Register machine level DMIC DAPM routes with the card Peter Ujfalusi
2014-03-13 19:10 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 05/12] ASoC: omap: rx51: Convert to table based control and DAPM setup Lars-Peter Clausen
2014-03-21 18:03 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 06/12] ASoC: omap3pandora: Convert to table based " Lars-Peter Clausen
2014-03-21 18:04 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 07/12] ASoC: davinci-evm: Register machine level DAPM elements with the card Lars-Peter Clausen
2014-03-13 10:07 ` Peter Ujfalusi
2014-03-13 19:11 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 08/12] ASoC: snappercl15: Convert to table based DAPM setup Lars-Peter Clausen
2014-03-13 9:38 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 09/12] ASoC: s6105-ipcam: " Lars-Peter Clausen
2014-03-13 11:43 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 10/12] ASoC: pxa: magician: Convert to table based DAPM and control setup Lars-Peter Clausen
2014-03-13 9:41 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 11/12] ASoC: pxa: tosa: " Lars-Peter Clausen
2014-03-13 9:41 ` Mark Brown
2014-03-12 14:27 ` [PATCH v2 12/12] ASoC: Remove name_prefix unset during DAI link init hack Lars-Peter Clausen
2014-03-25 12:53 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394634460-15889-5-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=alsa-devel@alsa-project.org \
--cc=bcousson@baylibre.com \
--cc=broonie@kernel.org \
--cc=daniel-gl@gmx.net \
--cc=jarkko.nikula@bitmer.com \
--cc=lgirdwood@gmail.com \
--cc=peter.ujfalusi@ti.com \
--cc=rmallon@gmail.com \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox