From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Lars-Peter Clausen <lars@metafoo.de>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org, "Ryan Mallon" <rmallon@gmail.com>,
"Vinod Koul" <vinod.koul@intel.com>,
"Daniel Glöckner" <daniel-gl@gmx.net>,
"Benoit Cousson" <bcousson@baylibre.com>,
"Jarkko Nikula" <jarkko.nikula@bitmer.com>
Subject: Re: [PATCH v2 07/12] ASoC: davinci-evm: Register machine level DAPM elements with the card
Date: Thu, 13 Mar 2014 12:07:41 +0200 [thread overview]
Message-ID: <5321836D.7030901@ti.com> (raw)
In-Reply-To: <1394634460-15889-8-git-send-email-lars@metafoo.de>
On 03/12/2014 04:27 PM, Lars-Peter Clausen wrote:
> Machine level DAPM widgets and routes should be registered in the card's DAPM
> context, rather than in the CODEC's context.
>
> While we are at it also drop the snd_soc_dapm_enable_pin() calls, since pins are
> enabled by default and also turn the snd_soc_dapm_disable_pin() calls into
> snd_soc_dapm_nc_pin() calls for unconnected pins.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
> Changes since v1:
> * Remove snd_soc_dapm_enable_pin() calls
> * Change snd_soc_dapm_disable_pin() calles into snd_soc_dapm_nc_pin()
> ---
> sound/soc/davinci/davinci-evm.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
> index 70ff377..9c296f7 100644
> --- a/sound/soc/davinci/davinci-evm.c
> +++ b/sound/soc/davinci/davinci-evm.c
> @@ -95,35 +95,29 @@ static const struct snd_soc_dapm_route audio_map[] = {
> /* Logic for a aic3x as connected on a davinci-evm */
> static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
> {
> + struct snd_soc_card *card = rtd->card;
> struct snd_soc_codec *codec = rtd->codec;
> - struct snd_soc_dapm_context *dapm = &codec->dapm;
> struct device_node *np = codec->card->dev->of_node;
> int ret;
>
> /* Add davinci-evm specific widgets */
> - snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets,
> + snd_soc_dapm_new_controls(&card->dapm, aic3x_dapm_widgets,
> ARRAY_SIZE(aic3x_dapm_widgets));
>
> if (np) {
> - ret = snd_soc_of_parse_audio_routing(codec->card,
> - "ti,audio-routing");
> + ret = snd_soc_of_parse_audio_routing(card, "ti,audio-routing");
> if (ret)
> return ret;
> } else {
> /* Set up davinci-evm specific audio path audio_map */
> - snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
> + snd_soc_dapm_add_routes(&card->dapm, audio_map,
> + ARRAY_SIZE(audio_map));
> }
>
> /* not connected */
> - snd_soc_dapm_disable_pin(dapm, "MONO_LOUT");
> - snd_soc_dapm_disable_pin(dapm, "HPLCOM");
> - snd_soc_dapm_disable_pin(dapm, "HPRCOM");
> -
> - /* always connected */
> - snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
> - snd_soc_dapm_enable_pin(dapm, "Line Out");
> - snd_soc_dapm_enable_pin(dapm, "Mic Jack");
> - snd_soc_dapm_enable_pin(dapm, "Line In");
> + snd_soc_dapm_nc_pin(&codec->dapm, "MONO_LOUT");
> + snd_soc_dapm_nc_pin(&codec->dapm, "HPLCOM");
> + snd_soc_dapm_nc_pin(&codec->dapm, "HPRCOM");
>
> return 0;
> }
>
--
Péter
next prev parent reply other threads:[~2014-03-13 10:07 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 [this message]
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=5321836D.7030901@ti.com \
--to=peter.ujfalusi@ti.com \
--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=lars@metafoo.de \
--cc=lgirdwood@gmail.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).