Skip to contentSkip to conversation

WM9712 monoout

PATCH In review Mike Rapoport 2 participants 4 messages Oct 22, 2007 2 messages not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 8 lines · Liam Girdwood
Quoted 6 lines · Mike Rapoport

Hello,

I'm trying to enable phone on a board with WM9715 codec.
I have not found a control responsible for mute/unmute the MONOUT. My question is whether I should add this control as platform specific control, or it would be correct to patch sound/soc/codecs/wm9712.c?

Quoted 6 lines

It should probably go in the codec driver. It looks like an omission.

Quoted 2 lines

Also, "Mono Playback Volume" control is not inverted, which seems to be a bug.

Could you send a patch ?

Sure. A also found that treble and bass need to be inverted.

Quoted 4 lines

Many Thanks

Liam

 sound/soc/codecs/wm9712.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
sound/soc/codecs/wm9712.c +4 -3
index 986b5d5..427cb61 100644
@@ -102,7 +102,8 @@ SOC_SINGLE("Speaker Playback ZC Switch", AC97_MASTER, 7, 1, 0),
 SOC_SINGLE("Speaker Playback Invert Switch", AC97_MASTER, 6, 1, 0),
 SOC_SINGLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 7, 1, 0),
 SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_MONO, 7, 1, 0),
-SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 0),
+SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1),
+SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
 
 SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0),
 SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0),
@@ -145,8 +146,8 @@ SOC_ENUM("Bass Control", wm9712_enum[5]),
 SOC_SINGLE("Bass Cut-off Switch", AC97_MASTER_TONE, 12, 1, 1),
 SOC_SINGLE("Tone Cut-off Switch", AC97_MASTER_TONE, 4, 1, 1),
 SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0),
-SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 0),
-SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 0),
+SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1),
+SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1),
 
 SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1),
 SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),
#3 lore raw

At Mon, 22 Oct 2007 16:12:14 +0200,

Quoted 18 lines · Mike Rapoport
Quoted 8 lines · Liam Girdwood
Quoted 6 lines · Mike Rapoport

Hello,

I'm trying to enable phone on a board with WM9715 codec.
I have not found a control responsible for mute/unmute the MONOUT. My question is whether I should add this control as platform specific control, or it would be correct to patch sound/soc/codecs/wm9712.c?

Quoted 6 lines

It should probably go in the codec driver. It looks like an omission.

Quoted 2 lines

Also, "Mono Playback Volume" control is not inverted, which seems to be a bug.

Could you send a patch ?

Quoted 8 lines

Sure. A also found that treble and bass need to be inverted.

Quoted 4 lines

Many Thanks

Liam

A short description of your patch would be appreciated so that I can commit it to the upstream tree.

thanks,

Takashi

Quoted 35 lines
 sound/soc/codecs/wm9712.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
sound/soc/codecs/wm9712.c +4 -3
index 986b5d5..427cb61 100644
@@ -102,7 +102,8 @@ SOC_SINGLE("Speaker Playback ZC Switch", AC97_MASTER, 7, 1, 0),
 SOC_SINGLE("Speaker Playback Invert Switch", AC97_MASTER, 6, 1, 0),
 SOC_SINGLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 7, 1, 0),
 SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_MONO, 7, 1, 0),
-SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 0),
+SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1),
+SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
 
 SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0),
 SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0),
@@ -145,8 +146,8 @@ SOC_ENUM("Bass Control", wm9712_enum[5]),
 SOC_SINGLE("Bass Cut-off Switch", AC97_MASTER_TONE, 12, 1, 1),
 SOC_SINGLE("Tone Cut-off Switch", AC97_MASTER_TONE, 4, 1, 1),
 SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0),
-SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 0),
-SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 0),
+SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1),
+SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1),
 
 SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1),
 SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#4 lore raw

PATCH 1/1 WM9712 SoC driver fixes (was WM9712 monoout)

Quoted 7 lines · Takashi Iwai

At Mon, 22 Oct 2007 16:12:14 +0200,

Quoted 2 lines · Mike Rapoport
Quoted 1 line

A short description of your patch would be appreciated so that I can commit it to the upstream tree.

Sorry, missed that...

The following patch adds "Mono Playback Switch" control to WM9712 codec SoC driver. Also, it fixes Treble, Bass and Mono playback volume inversion bits.

 sound/soc/codecs/wm9712.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
sound/soc/codecs/wm9712.c +4 -3
index 986b5d5..427cb61 100644
@@ -102,7 +102,8 @@ SOC_SINGLE("Speaker Playback ZC Switch", AC97_MASTER, 7, 1, 0),
 SOC_SINGLE("Speaker Playback Invert Switch", AC97_MASTER, 6, 1, 0),
 SOC_SINGLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 7, 1, 0),
 SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_MONO, 7, 1, 0),
-SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 0),
+SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1),
+SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
 
 SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0),
 SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0),
@@ -145,8 +146,8 @@ SOC_ENUM("Bass Control", wm9712_enum[5]),
 SOC_SINGLE("Bass Cut-off Switch", AC97_MASTER_TONE, 12, 1, 1),
 SOC_SINGLE("Tone Cut-off Switch", AC97_MASTER_TONE, 4, 1, 1),
 SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0),
-SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 0),
-SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 0),
+SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1),
+SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1),
 
 SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1),
 SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),
#5 lore raw

Re: [PATCH] WM9712 SoC driver fixes (was WM9712 monoout)

At Mon, 22 Oct 2007 17:16:08 +0200,

Quoted 12 lines · Mike Rapoport
Quoted 7 lines · Takashi Iwai

At Mon, 22 Oct 2007 16:12:14 +0200,

Quoted 2 lines · Mike Rapoport
Quoted 1 line

A short description of your patch would be appreciated so that I can commit it to the upstream tree.

Quoted 6 lines

Sorry, missed that...

The following patch adds "Mono Playback Switch" control to WM9712 codec SoC driver. Also, it fixes Treble, Bass and Mono playback volume inversion bits.

Thanks, now applied to ALSA HG tree.

Takashi