From: Chen-Yu Tsai <wens@csie.org>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>
Cc: Chen-Yu Tsai <wens@csie.org>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] ASoC: dapm: Give error when adding hardware backed controls for PGA widgets
Date: Sat, 27 Aug 2016 19:28:01 +0800 [thread overview]
Message-ID: <20160827112801.31010-5-wens@csie.org> (raw)
In-Reply-To: <20160827112801.31010-1-wens@csie.org>
Commit 19a2557b76d6 ("ASoC: dapm: Add kcontrol support for PGAs") added
kcontrol support for PGA widgets, but did not add necessary changes to
snd_soc_dapm_put_volsw or soc_dapm_mixer_update_power to have hardware
register updates actually happen.
As this is a little used feature, this patch just adds an error message
when someone tries to use hardware backed controls with PGA or output
driver widgets.
Fixes: 19a2557b76d6 ("ASoC: dapm: Add kcontrol support for PGAs")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
sound/soc/soc-dapm.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index ed6b707cc7ce..f681a251d766 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -984,6 +984,14 @@ static int dapm_new_pga(struct snd_soc_dapm_widget *w)
int i, ret;
for (i = 0; i < w->num_kcontrols; i++) {
+ const struct soc_mixer_control *mc =
+ (struct soc_mixer_control *)w->kcontrol_news[i].private_value;
+
+ if (mc->reg != SND_SOC_NOPM)
+ dev_err(w->dapm->dev,
+ "ASoC: hardware backed PGA controls not supported: '%s'\n",
+ w->name);
+
ret = dapm_create_or_share_kcontrol(w, i);
if (ret < 0)
return ret;
--
2.9.3
prev parent reply other threads:[~2016-08-27 12:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-27 11:27 [PATCH 0/4] ASoC: dapm: Various fixes for dapm kcontrols Chen-Yu Tsai
2016-08-27 11:27 ` [PATCH 1/4] ASoC: dapm: Fix possible uninitialized variable in snd_soc_dapm_get_volsw() Chen-Yu Tsai
2016-08-27 11:27 ` [PATCH 2/4] ASoC: dapm: Fix value setting for _ENUM_DOUBLE MUX's second channel Chen-Yu Tsai
2016-08-30 8:42 ` [alsa-devel] " Charles Keepax
2016-08-27 11:28 ` [PATCH 3/4] ASoC: dapm: Fix kcontrol creation for output driver widget Chen-Yu Tsai
2016-08-27 11:28 ` Chen-Yu Tsai [this message]
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=20160827112801.31010-5-wens@csie.org \
--to=wens@csie.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.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
all inboxes | Powered by JetHome®