From: Petr Kulhavy <brain@jikos.cz>
To: broonie@kernel.org, lgirdwood@gmail.com
Cc: alsa-devel@alsa-project.org, Petr Kulhavy <brain@jikos.cz>
Subject: [PATCH 5/5] ASoC: tas571x: move mixer volume controls from TAS5711 to TAS5717
Date: Mon, 3 Oct 2016 16:40:50 +0200 [thread overview]
Message-ID: <1475505650-8572-6-git-send-email-brain@jikos.cz> (raw)
In-Reply-To: <1475505650-8572-1-git-send-email-brain@jikos.cz>
Channel 1 and 2 Mixer Volume controls (registers 0x72/0x73 and 0x76/0x77)
were wrongly assigned to tas5711_controls in commit f252d2346022
("ASoC: tas571x: add input channel mixer for TAS5717/19")
Therefore move them to tas5717_controls.
Signed-off-by: Petr Kulhavy <brain@jikos.cz>
---
sound/soc/codecs/tas571x.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/sound/soc/codecs/tas571x.c b/sound/soc/codecs/tas571x.c
index f3252af..71790a1 100644
--- a/sound/soc/codecs/tas571x.c
+++ b/sound/soc/codecs/tas571x.c
@@ -391,16 +391,6 @@ static const struct snd_kcontrol_new tas5711_controls[] = {
TAS571X_SOFT_MUTE_REG,
TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,
1, 1),
-
- SOC_DOUBLE_R_RANGE("CH1 Mixer Volume",
- TAS5717_CH1_LEFT_CH_MIX_REG,
- TAS5717_CH1_RIGHT_CH_MIX_REG,
- 16, 0, 0x80, 0),
-
- SOC_DOUBLE_R_RANGE("CH2 Mixer Volume",
- TAS5717_CH2_LEFT_CH_MIX_REG,
- TAS5717_CH2_RIGHT_CH_MIX_REG,
- 16, 0, 0x80, 0),
};
static const struct regmap_range tas571x_readonly_regs_range[] = {
@@ -478,6 +468,16 @@ static const struct snd_kcontrol_new tas5717_controls[] = {
TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,
1, 1),
+ SOC_DOUBLE_R_RANGE("CH1 Mixer Volume",
+ TAS5717_CH1_LEFT_CH_MIX_REG,
+ TAS5717_CH1_RIGHT_CH_MIX_REG,
+ 16, 0, 0x80, 0),
+
+ SOC_DOUBLE_R_RANGE("CH2 Mixer Volume",
+ TAS5717_CH2_LEFT_CH_MIX_REG,
+ TAS5717_CH2_RIGHT_CH_MIX_REG,
+ 16, 0, 0x80, 0),
+
/*
* The biquads are named according to the register names.
* Please note that TI's TAS57xx Graphical Development Environment
--
2.7.4
next prev parent reply other threads:[~2016-10-03 14:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-03 14:40 [PATCH 0/5] ASoC: tas571x: fix of several issues for TAS5717 Petr Kulhavy
2016-10-03 14:40 ` [PATCH 1/5] ASoC: tas571x: fix missing bias save level Petr Kulhavy
2016-10-03 17:09 ` Lars-Peter Clausen
2016-10-03 19:00 ` Petr Kulhavy
2016-10-03 19:11 ` Lars-Peter Clausen
2016-10-03 19:13 ` Lars-Peter Clausen
2016-10-03 20:24 ` Petr Kulhavy
2016-10-03 14:40 ` [PATCH 2/5] ASoC: tas571x: extend the t_i2c time to comply with TAS5721 Petr Kulhavy
2016-10-05 15:21 ` Applied "ASoC: tas571x: extend the t_i2c time to comply with TAS5721" to the asoc tree Mark Brown
2016-10-03 14:40 ` [PATCH 3/5] ASoC: tas571x: remove improper PDN signal usage in set_bias_level Petr Kulhavy
2016-10-05 15:21 ` Applied "ASoC: tas571x: remove improper PDN signal usage in set_bias_level" to the asoc tree Mark Brown
2016-10-03 14:40 ` [PATCH 4/5] ASoC: tas571x: wait 50ms after oscillator trim Petr Kulhavy
2016-10-05 15:22 ` Applied "ASoC: tas571x: wait 50ms after oscillator trim" to the asoc tree Mark Brown
2016-10-03 14:40 ` Petr Kulhavy [this message]
2016-10-05 15:21 ` Applied "ASoC: tas571x: move mixer volume controls from TAS5711 to TAS5717" " 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=1475505650-8572-6-git-send-email-brain@jikos.cz \
--to=brain@jikos.cz \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).