From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 3/5] ASoC: JZ4740: Convert qi_lb60 codec to table based DAPM setup
Date: Tue, 12 Apr 2011 19:31:03 +0200 [thread overview]
Message-ID: <1302629465-21315-3-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1302629465-21315-1-git-send-email-lars@metafoo.de>
Use the newly introduced dapm_widgets, dpam_routes and fields of the
snd_soc_card struct to setup DAPM.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/soc/jz4740/qi_lb60.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 49723e3..875abc9 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -70,12 +70,6 @@ static int qi_lb60_codec_init(struct snd_soc_pcm_runtime *rtd)
return ret;
}
- snd_soc_dapm_new_controls(dapm, qi_lb60_widgets,
- ARRAY_SIZE(qi_lb60_widgets));
- snd_soc_dapm_add_routes(dapm, qi_lb60_routes,
- ARRAY_SIZE(qi_lb60_routes));
- snd_soc_dapm_sync(dapm);
-
return 0;
}
@@ -93,6 +87,11 @@ static struct snd_soc_card qi_lb60 = {
.name = "QI LB60",
.dai_link = &qi_lb60_dai,
.num_links = 1,
+
+ .dapm_widgets = qi_lb60_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(qi_lb60_widgets),
+ .dapm_routes = qi_lb60_routes,
+ .num_dapm_routes = ARRAY_SIZE(qi_lb60_routes),
};
static struct platform_device *qi_lb60_snd_device;
--
1.7.2.5
next prev parent reply other threads:[~2011-04-12 17:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-12 17:31 [PATCH 1/5] ASoC: Make struct snd_soc_card's dapm_widgets and dapm_routes const Lars-Peter Clausen
2011-04-12 17:31 ` [PATCH 2/5] ASoC: Call snd_soc_new_widgets() after registering cards DAPM widgets Lars-Peter Clausen
2011-04-13 0:38 ` Mark Brown
2011-04-13 12:32 ` Lars-Peter Clausen
2011-04-13 17:32 ` Mark Brown
2011-04-13 19:26 ` Lars-Peter Clausen
2011-04-12 17:31 ` Lars-Peter Clausen [this message]
2011-04-12 17:31 ` [PATCH 4/5] ASoC: JZ4740: qi_lb60: Use gpio_request_array to request and setup gpios Lars-Peter Clausen
2011-04-12 17:31 ` [PATCH 5/5] ASoC: JZ4740: qi_lb60: Use the SND_SOC_DAPM_EVENT_OFF for the speakers status Lars-Peter Clausen
2011-04-13 7:39 ` [alsa-devel] [PATCH 1/5] ASoC: Make struct snd_soc_card's dapm_widgets and dapm_routes const Liam Girdwood
2011-04-13 17:36 ` 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=1302629465-21315-3-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@slimlogic.co.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;
as well as URLs for NNTP newsgroup(s).