From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org, lars@metafoo.de
Subject: [PATCH 2/2] ASoC: tlv320aic3x: Fix Left/Rigth PGA mixer widgets/kcontrols
Date: Tue, 27 May 2014 13:53:06 +0300 [thread overview]
Message-ID: <1401187986-11059-3-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1401187986-11059-1-git-send-email-peter.ujfalusi@ti.com>
Commit "cf7c1de20c576 ASoC: dapm: Move 'value' field from widget to
control" changed the way how the 'value' has been stored for a widget.
Since the driver is not updated following the mentioned commit it is mostly
broken when we try to change mixers for Left/Right PGA since the value is
not going to be updated correctly.
This can be seen when trying to switch of one of the routes for the first
time (the second try will succeed):
amixer sset 'Left PGA Mixer Line1L' off
amixer: Invalid command!
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
sound/soc/codecs/tlv320aic3x.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index d7349bc89ad3..167c95bdf289 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -156,21 +156,21 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
int connect, change;
val = (ucontrol->value.integer.value[0] & mask);
+ connect = !!val;
+
+ if (invert)
+ val = max - val;
+
+ change = dapm_kcontrol_set_value(kcontrol, val);
mask = 0xf;
if (val)
val = mask;
- connect = !!val;
-
- if (invert)
- val = mask - val;
-
mask <<= shift;
val <<= shift;
- change = snd_soc_test_bits(codec, val, mask, reg);
- if (change) {
+ if (change && snd_soc_test_bits(codec, val, mask, reg)) {
update.kcontrol = kcontrol;
update.reg = reg;
update.mask = mask;
--
1.9.3
next prev parent reply other threads:[~2014-05-27 10:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 10:53 [PATCH 0/2] ASoC: tlv320aic3x: Fix snd_soc_dapm_put_volsw_aic3x callback Peter Ujfalusi
2014-05-27 10:53 ` [PATCH 1/2] ASoC: dapm: Export dapm_kcontrol_set_value() so it can be used by drivers Peter Ujfalusi
2014-05-27 10:53 ` Peter Ujfalusi [this message]
2014-05-27 11:18 ` [PATCH 2/2] ASoC: tlv320aic3x: Fix Left/Rigth PGA mixer widgets/kcontrols Lars-Peter Clausen
2014-05-27 11:41 ` Peter Ujfalusi
2014-05-27 11:54 ` Lars-Peter Clausen
2014-05-27 12:09 ` Lars-Peter Clausen
2014-05-27 12:19 ` Peter Ujfalusi
2014-05-27 12:24 ` Lars-Peter Clausen
2014-05-27 11:02 ` [PATCH 0/2] ASoC: tlv320aic3x: Fix snd_soc_dapm_put_volsw_aic3x callback Mark Brown
2014-05-27 13:04 ` Peter Ujfalusi
2014-05-28 7:27 ` Lars-Peter Clausen
2014-05-28 13:12 ` Peter Ujfalusi
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=1401187986-11059-3-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.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