[PATCH 3/3] ALSA: HDA: Add Front control for ALC887

[PATCH 3/3] ALSA: HDA: Add Front control for ALC887

[David Henningsson]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

HP and Line out share DAC, so we need a switch to turn line out off.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>

-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

[-- Attachment #2: 0003-ALSA-HDA-Add-Front-control-for-ALC887.patch --]
[-- Type: text/x-patch, Size: 1358 bytes --]

>From 955438a1e0f21218d207196456d8e46295f5feec Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Wed, 17 Nov 2010 15:06:15 +0100
Subject: [PATCH 3/3] ALSA: HDA: Add Front control for ALC887

HP and Line out share DAC, so we need a switch to turn line out off.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/patch_realtek.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 4cc7bb2..86df37c 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -10836,8 +10836,16 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
 	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
 	if (err < 0)
 		return err;
-	if (codec->vendor_id == 0x10ec0887)
+	if (codec->vendor_id == 0x10ec0887) {
 		err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
+		if (err < 0)
+			return err;
+		/* We need something to switch that doesn't affect headphones */
+		if (spec->autocfg.line_out_pins[0])
+			err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, "Front",
+				  HDA_COMPOSE_AMP_VAL(spec->autocfg.line_out_pins[0], 3, 0, HDA_OUTPUT));
+
+        }
 	else
 		err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
 	if (err < 0)
-- 
1.7.1


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 3/3] ALSA: HDA: Add Front control for ALC887

[Takashi Iwai]

At Fri, 19 Nov 2010 10:31:20 +0100,
David Henningsson wrote:
> 
> >From 955438a1e0f21218d207196456d8e46295f5feec Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.henningsson@canonical.com>
> Date: Wed, 17 Nov 2010 15:06:15 +0100
> Subject: [PATCH 3/3] ALSA: HDA: Add Front control for ALC887
> 
> HP and Line out share DAC, so we need a switch to turn line out off.

I suppose this patch depending on your second patch, so let's postpone.


thanks,

Takashi

> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
>  sound/pci/hda/patch_realtek.c |   10 +++++++++-
>  1 files changed, 9 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 4cc7bb2..86df37c 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -10836,8 +10836,16 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
>  	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
>  	if (err < 0)
>  		return err;
> -	if (codec->vendor_id == 0x10ec0887)
> +	if (codec->vendor_id == 0x10ec0887) {
>  		err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
> +		if (err < 0)
> +			return err;
> +		/* We need something to switch that doesn't affect headphones */
> +		if (spec->autocfg.line_out_pins[0])
> +			err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, "Front",
> +				  HDA_COMPOSE_AMP_VAL(spec->autocfg.line_out_pins[0], 3, 0, HDA_OUTPUT));
> +
> +        }
>  	else
>  		err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
>  	if (err < 0)
> -- 
> 1.7.1
>