tlv320aic3x: control additions and cleanups

PATCH Superseded Daniel Mack 3 participants 19 messages Dec 4, 2008 – Dec 5, 2008

Subsystems (3)

Sound ASoC Texas Instruments audio (ASoC/HDA) drivers

lore

Share & tools

lore

Daniel Mack

author

2008-12-04 17:51 UTC #0 lore raw

PATCH 1/1 tlv320aic3x: control additions and cleanups

Some minor updates for sound/soc/codecs/tlv320aic3x.c:

- removed "DAC" from name for "Mono playback switch", "HP playback switch" and "HPCOM playback switch". The registers used in the macro don't have anything to do with the DAC but mute the whole output, hence the names were misleading.
- 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 <[email protected]>

Signed-off-by Uli Luckas <[email protected]>

---
 sound/soc/codecs/tlv320aic3x.c |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

sound/soc/codecs/tlv320aic3x.c +16 -8

index 537bbbf..7cdaea3 100644
@@ -253,16 +253,22 @@ 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,
 		     DACR1_2_MONOLOPM_VOL, 0, 0x7f, 1),
-	SOC_SINGLE("Mono DAC Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0),
+	SOC_SINGLE("Mono Playback Switch", MONOLOPM_CTRL, 3, 0x01, 0),
 	SOC_DOUBLE_R("Mono PGA Bypass Playback Volume", PGAL_2_MONOLOPM_VOL,
 		     PGAR_2_MONOLOPM_VOL, 0, 0x7f, 1),
 	SOC_DOUBLE_R("Mono Line2 Bypass Playback Volume", LINE2L_2_MONOLOPM_VOL,

@@ -270,8 +276,10 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
 
 	SOC_DOUBLE_R("HP DAC Playback Volume", DACL1_2_HPLOUT_VOL,
 		     DACR1_2_HPROUT_VOL, 0, 0x7f, 1),
-	SOC_DOUBLE_R("HP DAC Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3,
+	SOC_DOUBLE_R("HP 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,

@@ -281,7 +289,7 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
 
 	SOC_DOUBLE_R("HPCOM DAC Playback Volume", DACL1_2_HPLCOM_VOL,
 		     DACR1_2_HPRCOM_VOL, 0, 0x7f, 1),
-	SOC_DOUBLE_R("HPCOM DAC Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3,
+	SOC_DOUBLE_R("HPCOM Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3,
 		     0x01, 0),
 	SOC_SINGLE("HPLCOM PGA Bypass Playback Volume", PGAL_2_HPLCOM_VOL,
 		     0, 0x7f, 1),

Signature · 1 line

1.5.6.5

Jarkko Nikula

2008-12-04 18:32 UTC #1 lore raw

Quoted 6 lines · Daniel Mack

Some minor updates for sound/soc/codecs/tlv320aic3x.c:
- removed "DAC" from name for "Mono playback switch", "HP playback switch" and "HPCOM playback switch". The registers used in the macro don't have anything to do with the DAC but mute the whole output, hence the names were misleading.

Hi Daniel!

This is true, I found it also sometime ago that muting those DAC playback switches muted the whole output even there were bypass paths active but didn't find time to look it any deeper yet.

I think by quick look, that your fix changing "x DAC Playback Switch" to "x Playback Switch" separating it thus from "x DAC Playback Volume" is likely correct one.

I'll try to look this tomorrow or monday and give you a note. Generally I would say, this should go as a separate fix patch and changes below into another.

Quoted 8 lines

- 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"

Jarkko

Mark Brown

2008-12-04 18:43 UTC #2 lore raw

Quoted 3 lines · Jarkko Nikula

I'll try to look this tomorrow or monday and give you a note. Generally I would say, this should go as a separate fix patch and changes below into another.

Yes, I'd tend to agree with that - small, focused patches are easier to review and if there's any problem with part of a patch it means only that part needs to be reposted.

Mark Brown

2008-12-04 18:37 UTC #3 lore raw

In reply to Daniel Mack

Quoted 4 lines · Daniel Mack

- 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"

I can't help thinking that it'd be easier to just use "Left Line" and "Right Line" but that's an existing issue in the driver.

Quoted 2 lines

Signed-off-by Daniel Mack <[email protected]>
Signed-off-by Uli Luckas <[email protected]>

Did you write this patch or did Uli? If you wrote it the line for Uli should be an Acked-by, if he wrote it then your Signed-off-by should come second and it should have a From: for him at the top.

The patch itself looks good.

Daniel Mack

author

2008-12-04 18:47 UTC #4 lore raw

Hi Mark,

Quoted 5 lines · Mark Brown

Quoted 2 lines
Signed-off-by Daniel Mack <[email protected]>
Signed-off-by Uli Luckas <[email protected]>
Did you write this patch or did Uli? If you wrote it the line for Uli should be an Acked-by, if he wrote it then your Signed-off-by should come second and it should have a From: for him at the top.

We're working on it together and share a git repository. I commited the patch, sent it over to Uli to double-check it and he signed off on it after I did it in the first place.

I thought in such cases, two Signed-off-by: lines coming right after the other is the way to go, but I can also change it to an 'Acked-by' if you like.

I'll wait for Jarkko's comments and repost.

Thanks,
Daniel

Mark Brown

2008-12-04 18:53 UTC #5 lore raw

Quoted 7 lines · Daniel Mack

We're working on it together and share a git repository. I commited the patch, sent it over to Uli to double-check it and he signed off on it after I did it in the first place.
I thought in such cases, two Signed-off-by: lines coming right after the other is the way to go, but I can also change it to an 'Acked-by' if you like.

No, that sounds sensible. Normally for cases like that you'd mention what Uli's involvement in the patch was in the body of the commit message.

Jarkko Nikula

2008-12-05 13:02 UTC #6 lore raw

In reply to Daniel Mack

Quoted 13 lines · Daniel Mack

Hi Mark,
Quoted 5 lines · Mark Brown
Quoted 2 lines
Signed-off-by Daniel Mack <[email protected]>
Signed-off-by Uli Luckas <[email protected]>
Did you write this patch or did Uli? If you wrote it the line for Uli should be an Acked-by, if he wrote it then your Signed-off-by should come second and it should have a From: for him at the top.
We're working on it together and share a git repository. I commited the patch, sent it over to Uli to double-check it and he signed off on it after I did it in the first place.

Quoted 7 lines

I thought in such cases, two Signed-off-by: lines coming right after the other is the way to go, but I can also change it to an 'Acked-by' if you like.
I'll wait for Jarkko's comments and repost.
I just checked & tested a fix which changes those "xxx DAC Playback Switch"

to "xxx Playback Switch" are correct. That would also allow to develop new "xxx Playback Volume" controls and gain 9 dB more of output level :-)

Jarkko

Mark Brown

2008-12-05 13:12 UTC #7 lore raw

Quoted 3 lines · Jarkko Nikula

I just checked & tested a fix which changes those "xxx DAC Playback Switch" to "xxx Playback Switch" are correct. That would also allow to develop new "xxx Playback Volume" controls and gain 9 dB more of output level :-)

So does the patch have your ack?

Jarkko Nikula

2008-12-05 13:37 UTC #8 lore raw

Quoted 10 lines · Mark Brown

Quoted 1 line · Jarkko Nikula
I just checked & tested a fix which changes those "xxx DAC Playback
Switch"
Quoted 1 line
to "xxx Playback Switch" are correct. That would also allow to develop
new
Quoted 1 line
"xxx Playback Volume" controls and gain 9 dB more of output level :-)
So does the patch have your ack?

I think patch misses control like "HP Left PGA Bypass Playback Volume"?

Jarkko

Jarkko Nikula

2008-12-05 12:45 UTC #9 lore raw

In reply to Mark Brown

Quoted 10 lines · Mark Brown

Quoted 4 lines · Daniel Mack
- 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"
I can't help thinking that it'd be easier to just use "Left Line" and "Right Line" but that's an existing issue in the driver.

Yeah, same thoughts. Started to look only now, but what's the idea to separate stereo control into two mono control in commit 54f01916297bafc18bd7df4e2300a0544a84fce3? Change like

- SOC_DOUBLE_R("HP PGA Bypass Playback Volume", PGAL_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,
+ 0, 0x7f, 1),

Jarkko

Mark Brown

2008-12-05 13:00 UTC #10 lore raw

Quoted 8 lines · Jarkko Nikula

Quoted 2 lines · Mark Brown
I can't help thinking that it'd be easier to just use "Left Line" and "Right Line" but that's an existing issue in the driver.
Yeah, same thoughts. Started to look only now, but what's the idea to separate stereo control into two mono control in commit 54f01916297bafc18bd7df4e2300a0544a84fce3? Change like

Several codecs do this - systems often end up doing things like using the line inputs as unrelated mono paths rather than as a stereo path. How likely that is to happen with this codec I don't know.

Jarkko Nikula

2008-12-05 13:21 UTC #11 lore raw

Quoted 7 lines · Mark Brown

Quoted 1 line · Jarkko Nikula
On Thu, Dec 4, 2008 at 8:37 PM, Mark Brown <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
I can't help thinking that it'd be easier to just use "Left Line" and "Right Line" but that's an existing issue in the driver.

Quoted 8 lines

Quoted 3 lines
Yeah, same thoughts. Started to look only now, but what's the idea to separate stereo control into two mono control in commit 54f01916297bafc18bd7df4e2300a0544a84fce3? Change like
Several codecs do this - systems often end up doing things like using the line inputs as unrelated mono paths rather than as a stereo path. How likely that is to happen with this codec I don't know.

Or did I read the idea of patch wrong? Before there were stereo contol for

PGAL -> HPL
PGAR -> HPR

and now

PGAL -> HPL
PGAL -> HPR

PGAR seems to be missing?

Jarkko

Mark Brown

2008-12-05 13:43 UTC #12 lore raw

Quoted 14 lines · Jarkko Nikula

Quoted 7 lines · Mark Brown
Quoted 1 line · Jarkko Nikula
54f01916297bafc18bd7df4e2300a0544a84fce3? Change like
Several codecs do this - systems often end up doing things like using the line inputs as unrelated mono paths rather than as a stereo path. How likely that is to happen with this codec I don't know.
Or did I read the idea of patch wrong? Before there were stereo contol for
PGAL -> HPL
PGAR -> HPR

Quoted 6 lines

and now
PGAL -> HPL
PGAL -> HPR
PGAR seems to be missing?

Hrm. This looks like it just substitutes two single controls for one stereo control, which seems reasonable and shouldn't loose any control:

Review

Quoted 6 lines

(quoted diff) +4 -2

-       SOC_DOUBLE_R("HP PGA Bypass Playback Volume", PGAL_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,
+                    0, 0x7f, 1),

Possibly the controls are mislabeled?

Daniel?

Daniel Mack

author

2008-12-05 13:46 UTC #13 lore raw

Quoted 11 lines · Mark Brown

Quoted 7 lines
Quoted 1 line · Jarkko Nikula
and now
PGAL -> HPL
PGAL -> HPR
PGAR seems to be missing?
Hrm. This looks like it just substitutes two single controls for one stereo control, which seems reasonable and shouldn't loose any control:

Quoted 8 lines

Review

Quoted 6 lines

(quoted diff) +4 -2

-       SOC_DOUBLE_R("HP PGA Bypass Playback Volume", PGAL_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,
+                    0, 0x7f, 1),

Possibly the controls are mislabeled?

We could call them "HPR PGA left Bypass Playback Volume" and "HPR PGA right Bypass Playback Volume" to be more precise.

Daniel

Daniel Mack

author

2008-12-05 15:11 UTC #14 lore raw

In reply to Mark Brown

Hi,

Quoted 11 lines · Mark Brown

Hrm. This looks like it just substitutes two single controls for one stereo control, which seems reasonable and shouldn't loose any control:
Review
Quoted 6 lines
(quoted diff) +4 -2
-       SOC_DOUBLE_R("HP PGA Bypass Playback Volume", PGAL_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,
+                    0, 0x7f, 1),
Possibly the controls are mislabeled?

As this is commited already, I'd like to make the naming cleanup part of the patch with the "DAC" string removals. Is that ok for you?

Apart from that, can the other one be applied?

Best regards,
Daniel

Jarkko Nikula

2008-12-05 15:37 UTC #15 lore raw

Quoted 7 lines · Daniel Mack

As this is commited already, I'd like to make the naming cleanup part of the patch with the "DAC" string removals. Is that ok for you?
Apart from that, can the other one be applied?
Yep, I think this fair move forward. It saves my ass as well ;-)

Jarkko

Mark Brown

2008-12-05 16:24 UTC #16 lore raw

Quoted 5 lines · Jarkko Nikula

Quoted 1 line · Daniel Mack
Apart from that, can the other one be applied?
Yep, I think this fair move forward. It saves my ass as well ;-)

Could you resend the exact patch that was agreed on, just to make sure?

Daniel Mack

author

2008-12-05 16:31 UTC #17 lore raw

PATCH RESEND 1/1 tlv320aic3x: control additions and cleanups

- 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 <[email protected]>

---
Resent the patch Jarkko acked on.

 sound/soc/codecs/tlv320aic3x.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

sound/soc/codecs/tlv320aic3x.c +13 -5

index 537bbbf..6a12dc3 100644
@@ -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,

Signature · 1 line

1.5.6.5

Daniel Mack

author

2008-12-04 19:40 UTC #18 lore raw

PATCH 1/1 tlv320aic3x.c: split and add some mixer controls

In reply to Daniel Mack

This patch was colaboratively created with Uli Luckas.

Signed-off-by Daniel Mack <[email protected]>

---

I split the patches now - this one omits the removal of misleading "DAC"s in some widget names.

 sound/soc/codecs/tlv320aic3x.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

sound/soc/codecs/tlv320aic3x.c +13 -5

index 537bbbf..6a12dc3 100644
@@ -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,

Signature · 1 line

1.5.6.5