From: Daniel Mack <daniel@caiaq.org>
To: Mark Brown <broonie@sirena.org.uk>
Cc: alsa-devel@alsa-project.org, u.luckas@road.de
Subject: [PATCH] [RESEND] tlv320aic3x: control additions and cleanups
Date: Fri, 5 Dec 2008 17:31:00 +0100 [thread overview]
Message-ID: <20081205163100.GA3940@buzzloop.caiaq.de> (raw)
In-Reply-To: <20081205162430.GE10489@sirena.org.uk>
- split "Line Playback Switch" into "LineL Playback Switch" and "LineR
Playback Switch"
- split "Line PGA Bypass Playback Volume" into "LineL Left PGA Bypass
Playback Volume" and "LineR Right PGA Bypass Playback Volume"
- split "Line Line2 Bypass Playback Volume" into "LineL Line2 Bypass
Playback Volume" and "LineR Line2 Bypass Playback Volume"
- Added "HP Right PGA Bypass Playback Volume"
Signed-off-by: Daniel Mack <daniel@caiaq.de>
---
Resent the patch Jarkko acked on.
sound/soc/codecs/tlv320aic3x.c | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 537bbbf..6a12dc3 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -253,11 +253,17 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
SOC_DOUBLE_R("Line DAC Playback Volume", DACL1_2_LLOPM_VOL,
DACR1_2_RLOPM_VOL, 0, 0x7f, 1),
- SOC_DOUBLE_R("Line DAC Playback Switch", LLOPM_CTRL, RLOPM_CTRL, 3,
- 0x01, 0),
- SOC_DOUBLE_R("Line PGA Bypass Playback Volume", PGAL_2_LLOPM_VOL,
- PGAR_2_RLOPM_VOL, 0, 0x7f, 1),
- SOC_DOUBLE_R("Line Line2 Bypass Playback Volume", LINE2L_2_LLOPM_VOL,
+ SOC_SINGLE("LineL Playback Switch", LLOPM_CTRL, 3, 0x01, 0),
+ SOC_SINGLE("LineR Playback Switch", RLOPM_CTRL, 3, 0x01, 0),
+ SOC_DOUBLE_R("LineL DAC Playback Volume", DACL1_2_LLOPM_VOL,
+ DACR1_2_LLOPM_VOL, 0, 0x7f, 1),
+ SOC_SINGLE("LineL Left PGA Bypass Playback Volume", PGAL_2_LLOPM_VOL,
+ 0, 0x7f, 1),
+ SOC_SINGLE("LineR Right PGA Bypass Playback Volume", PGAR_2_RLOPM_VOL,
+ 0, 0x7f, 1),
+ SOC_DOUBLE_R("LineL Line2 Bypass Playback Volume", LINE2L_2_LLOPM_VOL,
+ LINE2R_2_LLOPM_VOL, 0, 0x7f, 1),
+ SOC_DOUBLE_R("LineR Line2 Bypass Playback Volume", LINE2L_2_RLOPM_VOL,
LINE2R_2_RLOPM_VOL, 0, 0x7f, 1),
SOC_DOUBLE_R("Mono DAC Playback Volume", DACL1_2_MONOLOPM_VOL,
@@ -272,6 +278,8 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
DACR1_2_HPROUT_VOL, 0, 0x7f, 1),
SOC_DOUBLE_R("HP DAC Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3,
0x01, 0),
+ SOC_DOUBLE_R("HP Right PGA Bypass Playback Volume", PGAR_2_HPLOUT_VOL,
+ PGAR_2_HPROUT_VOL, 0, 0x7f, 1),
SOC_SINGLE("HPL PGA Bypass Playback Volume", PGAL_2_HPLOUT_VOL,
0, 0x7f, 1),
SOC_SINGLE("HPR PGA Bypass Playback Volume", PGAL_2_HPROUT_VOL,
--
1.5.6.5
next prev parent reply other threads:[~2008-12-05 16:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-04 17:51 [PATCH] tlv320aic3x: control additions and cleanups Daniel Mack
2008-12-04 18:32 ` Jarkko Nikula
2008-12-04 18:43 ` Mark Brown
2008-12-04 18:37 ` Mark Brown
2008-12-04 18:47 ` Daniel Mack
2008-12-04 18:53 ` Mark Brown
2008-12-05 13:02 ` Jarkko Nikula
2008-12-05 13:12 ` Mark Brown
2008-12-05 13:37 ` Jarkko Nikula
2008-12-05 12:45 ` Jarkko Nikula
2008-12-05 13:00 ` Mark Brown
2008-12-05 13:21 ` Jarkko Nikula
2008-12-05 13:42 ` Mark Brown
2008-12-05 13:46 ` Daniel Mack
2008-12-05 15:11 ` Daniel Mack
2008-12-05 15:37 ` Jarkko Nikula
2008-12-05 16:24 ` Mark Brown
2008-12-05 16:31 ` Daniel Mack [this message]
2008-12-04 19:40 ` [PATCH] tlv320aic3x.c: split and add some mixer controls Daniel Mack
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=20081205163100.GA3940@buzzloop.caiaq.de \
--to=daniel@caiaq.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@sirena.org.uk \
--cc=u.luckas@road.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.