From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>,
alsa-devel@alsa-project.org, Lars-Peter Clausen <lars@metafoo.de>,
Eric Miao <eric.y.miao@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>
Subject: [PATCH 3/8] ASoC: pxa: e750_wm9705: Convert to table based DAPM setup
Date: Sat, 1 Mar 2014 15:48:15 +0100 [thread overview]
Message-ID: <1393685300-5307-3-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1393685300-5307-1-git-send-email-lars@metafoo.de>
Use table based setup to register the DAPM widgets and routes. This on one hand
makes the code a bit cleaner and on the other hand the board level DAPM elements
get registered in the card's DAPM context rather than in the CODEC's DAPM
context.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/soc/pxa/e750_wm9705.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index c34e447..ee36aba 100644
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -85,11 +85,6 @@ static int e750_ac97_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_nc_pin(dapm, "PCBEEP");
snd_soc_dapm_nc_pin(dapm, "MIC2");
- snd_soc_dapm_new_controls(dapm, e750_dapm_widgets,
- ARRAY_SIZE(e750_dapm_widgets));
-
- snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
return 0;
}
@@ -119,6 +114,11 @@ static struct snd_soc_card e750 = {
.owner = THIS_MODULE,
.dai_link = e750_dai,
.num_links = ARRAY_SIZE(e750_dai),
+
+ .dapm_widgets = e750_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(e750_dapm_widgets),
+ .dapm_routes = audio_map,
+ .num_dapm_routes = ARRAY_SIZE(audio_map),
};
static struct gpio e750_audio_gpios[] = {
--
1.8.0
next prev parent reply other threads:[~2014-03-01 14:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-01 14:48 [PATCH 1/8] ASoC: pxa: Pass correct DAPM context to {corgi, poodle, spitz}_ext_control Lars-Peter Clausen
2014-03-01 14:48 ` [PATCH 2/8] ASoC: pxa: e740_wm9705: Convert to table based DAPM setup Lars-Peter Clausen
2014-03-03 2:04 ` Mark Brown
2014-03-01 14:48 ` Lars-Peter Clausen [this message]
2014-03-03 2:05 ` [PATCH 3/8] ASoC: pxa: e750_wm9705: " Mark Brown
2014-03-01 14:48 ` [PATCH 4/8] ASoC: pxa: e800_wm9712: " Lars-Peter Clausen
2014-03-03 2:05 ` Mark Brown
2014-03-01 14:48 ` [PATCH 5/8] ASoC: pxa: magician: Convert to table based DAPM and control setup Lars-Peter Clausen
2014-03-03 2:02 ` Mark Brown
2014-03-01 14:48 ` [PATCH 6/8] ASoC: pxa: mioa701_wm9713: Convert to table based DAPM setup Lars-Peter Clausen
2014-03-03 2:01 ` Mark Brown
2014-03-03 2:02 ` Mark Brown
2014-03-01 14:48 ` [PATCH 7/8] ASoC: pxa: tosa: Convert to table based DAPM and control setup Lars-Peter Clausen
2014-03-03 2:03 ` Mark Brown
2014-03-01 14:48 ` [PATCH 8/8] ASoC: pxa: zylonite: Convert to table based DAPM setup Lars-Peter Clausen
2014-03-03 2:04 ` Mark Brown
2014-03-03 2:04 ` [PATCH 1/8] ASoC: pxa: Pass correct DAPM context to {corgi, poodle, spitz}_ext_control 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=1393685300-5307-3-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=eric.y.miao@gmail.com \
--cc=haojian.zhuang@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux@arm.linux.org.uk \
/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