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 10/12] ASoC: pxa: magician: Convert to table based DAPM and control setup
Date: Wed, 12 Mar 2014 15:27:38 +0100 [thread overview]
Message-ID: <1394634460-15889-11-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1394634460-15889-1-git-send-email-lars@metafoo.de>
Use table based setup to register the controls and DAPM widgets and routes. This
on one hand makes the code a bit shorter and 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/magician.c | 34 ++++++++++++----------------------
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 41ab6678..259e048 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -41,9 +41,8 @@ static int magician_hp_switch;
static int magician_spk_switch = 1;
static int magician_in_sel = MAGICIAN_MIC;
-static void magician_ext_control(struct snd_soc_codec *codec)
+static void magician_ext_control(struct snd_soc_dapm_context *dapm)
{
- struct snd_soc_dapm_context *dapm = &codec->dapm;
snd_soc_dapm_mutex_lock(dapm);
@@ -75,10 +74,9 @@ static void magician_ext_control(struct snd_soc_codec *codec)
static int magician_startup(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct snd_soc_codec *codec = rtd->codec;
/* check the jack status at stream startup */
- magician_ext_control(codec);
+ magician_ext_control(&rtd->card->dapm);
return 0;
}
@@ -277,13 +275,13 @@ static int magician_get_hp(struct snd_kcontrol *kcontrol,
static int magician_set_hp(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+ struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
if (magician_hp_switch == ucontrol->value.integer.value[0])
return 0;
magician_hp_switch = ucontrol->value.integer.value[0];
- magician_ext_control(codec);
+ magician_ext_control(&card->dapm);
return 1;
}
@@ -297,13 +295,13 @@ static int magician_get_spk(struct snd_kcontrol *kcontrol,
static int magician_set_spk(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+ struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
if (magician_spk_switch == ucontrol->value.integer.value[0])
return 0;
magician_spk_switch = ucontrol->value.integer.value[0];
- magician_ext_control(codec);
+ magician_ext_control(&card->dapm);
return 1;
}
@@ -400,7 +398,6 @@ static int magician_uda1380_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_dapm_context *dapm = &codec->dapm;
- int err;
/* NC codec pins */
snd_soc_dapm_nc_pin(dapm, "VOUTLHP");
@@ -410,19 +407,6 @@ static int magician_uda1380_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_nc_pin(dapm, "VINL");
snd_soc_dapm_nc_pin(dapm, "VINR");
- /* Add magician specific controls */
- err = snd_soc_add_codec_controls(codec, uda1380_magician_controls,
- ARRAY_SIZE(uda1380_magician_controls));
- if (err < 0)
- return err;
-
- /* Add magician specific widgets */
- snd_soc_dapm_new_controls(dapm, uda1380_dapm_widgets,
- ARRAY_SIZE(uda1380_dapm_widgets));
-
- /* Set up magician specific audio path interconnects */
- snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
return 0;
}
@@ -456,6 +440,12 @@ static struct snd_soc_card snd_soc_card_magician = {
.dai_link = magician_dai,
.num_links = ARRAY_SIZE(magician_dai),
+ .controls = uda1380_magician_controls,
+ .num_controls = ARRAY_SIZE(uda1380_magician_controls),
+ .dapm_widgets = uda1380_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets),
+ .dapm_routes = audio_map,
+ .num_dapm_routes = ARRAY_SIZE(audio_map),
};
static struct platform_device *magician_snd_device;
--
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 ` [PATCH v2 04/12] ASoC: omap-abe-twl6040: Register machine level DMIC DAPM routes with the card Lars-Peter Clausen
2014-03-13 10:06 ` 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 ` Lars-Peter Clausen [this message]
2014-03-13 9:41 ` [PATCH v2 10/12] ASoC: pxa: magician: Convert to table based DAPM and control setup 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-11-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;
as well as URLs for NNTP newsgroup(s).