[PATCH] ALSA: HDA: Add fixup pins for Ideapad Y550

[PATCH] ALSA: HDA: Add fixup pins for Ideapad Y550

[David Henningsson]

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

By adding the subwoofer as a speaker pin, it is treated correctly when 
auto-muting. I'm a little unsure of whether it should go to stable as 
well, because it needs yesterday's commit bb35febd to make sense (in 
fact, I developed parts of that patch in parallel). Any opinions?

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

[-- Attachment #2: 0001-ALSA-HDA-Add-fixup-pins-for-Ideapad-Y550.patch --]
[-- Type: text/x-patch, Size: 2002 bytes --]

>From 906cfc95288d8ee4b1995a736e4e780e9f434cd0 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Thu, 9 Sep 2010 08:51:44 +0200
Subject: [PATCH] ALSA: HDA: Add fixup pins for Ideapad Y550

By adding the subwoofer as a speaker pin, it is treated correctly when auto-muting.

BugLink: https://launchpad.net/bugs/611803
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/patch_realtek.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f11a9ca..0c25d22 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -18963,6 +18963,26 @@ static void alc662_auto_init(struct hda_codec *codec)
 		alc_inithook(codec);
 }
 
+enum {
+	ALC662_FIXUP_IDEAPAD,
+};
+
+static const struct alc_fixup alc662_fixups[] = {
+	[ALC662_FIXUP_IDEAPAD] = {
+		.pins = (const struct alc_pincfg[]) {
+			{ 0x17, 0x99130112 }, /* subwoofer */
+			{ }
+		}
+	},
+};
+
+static struct snd_pci_quirk alc662_fixup_tbl[] = {
+	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),
+	{}
+};
+
+
+
 static int patch_alc662(struct hda_codec *codec)
 {
 	struct alc_spec *spec;
@@ -18995,6 +19015,7 @@ static int patch_alc662(struct hda_codec *codec)
 	}
 
 	if (board_config == ALC662_AUTO) {
+		alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 1);
 		/* automatic parse from the BIOS config */
 		err = alc662_parse_auto_config(codec);
 		if (err < 0) {
@@ -19053,8 +19074,11 @@ static int patch_alc662(struct hda_codec *codec)
 	spec->vmaster_nid = 0x02;
 
 	codec->patch_ops = alc_patch_ops;
-	if (board_config == ALC662_AUTO)
+	if (board_config == ALC662_AUTO) {
 		spec->init_hook = alc662_auto_init;
+		alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 0);
+	}
+
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 	if (!spec->loopback.amplist)
 		spec->loopback.amplist = alc662_loopbacks;
-- 
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] ALSA: HDA: Add fixup pins for Ideapad Y550

[Takashi Iwai]

At Thu, 09 Sep 2010 09:04:10 +0200,
David Henningsson wrote:
> 
> By adding the subwoofer as a speaker pin, it is treated correctly when 
> auto-muting.

Applied now.

> I'm a little unsure of whether it should go to stable as 
> well, because it needs yesterday's commit bb35febd to make sense (in 
> fact, I developed parts of that patch in parallel). Any opinions?

Then this is no candidate for stable tree.
The stable tree is rather a small fix that can be applied obviously
for older kernels.  These are mostly regression fixes.  We have
relaxed somehow the rule for "new" features, but still such a patch
isn't always for stable tree.


thanks,

Takashi

> 
> -- 
> David Henningsson, Canonical Ltd.
> http://launchpad.net/~diwic
> [2 0001-ALSA-HDA-Add-fixup-pins-for-Ideapad-Y550.patch <text/x-patch (7bit)>]
> >From 906cfc95288d8ee4b1995a736e4e780e9f434cd0 Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.henningsson@canonical.com>
> Date: Thu, 9 Sep 2010 08:51:44 +0200
> Subject: [PATCH] ALSA: HDA: Add fixup pins for Ideapad Y550
> 
> By adding the subwoofer as a speaker pin, it is treated correctly when auto-muting.
> 
> BugLink: https://launchpad.net/bugs/611803
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> ---
>  sound/pci/hda/patch_realtek.c |   26 +++++++++++++++++++++++++-
>  1 files changed, 25 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index f11a9ca..0c25d22 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -18963,6 +18963,26 @@ static void alc662_auto_init(struct hda_codec *codec)
>  		alc_inithook(codec);
>  }
>  
> +enum {
> +	ALC662_FIXUP_IDEAPAD,
> +};
> +
> +static const struct alc_fixup alc662_fixups[] = {
> +	[ALC662_FIXUP_IDEAPAD] = {
> +		.pins = (const struct alc_pincfg[]) {
> +			{ 0x17, 0x99130112 }, /* subwoofer */
> +			{ }
> +		}
> +	},
> +};
> +
> +static struct snd_pci_quirk alc662_fixup_tbl[] = {
> +	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),
> +	{}
> +};
> +
> +
> +
>  static int patch_alc662(struct hda_codec *codec)
>  {
>  	struct alc_spec *spec;
> @@ -18995,6 +19015,7 @@ static int patch_alc662(struct hda_codec *codec)
>  	}
>  
>  	if (board_config == ALC662_AUTO) {
> +		alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 1);
>  		/* automatic parse from the BIOS config */
>  		err = alc662_parse_auto_config(codec);
>  		if (err < 0) {
> @@ -19053,8 +19074,11 @@ static int patch_alc662(struct hda_codec *codec)
>  	spec->vmaster_nid = 0x02;
>  
>  	codec->patch_ops = alc_patch_ops;
> -	if (board_config == ALC662_AUTO)
> +	if (board_config == ALC662_AUTO) {
>  		spec->init_hook = alc662_auto_init;
> +		alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 0);
> +	}
> +
>  #ifdef CONFIG_SND_HDA_POWER_SAVE
>  	if (!spec->loopback.amplist)
>  		spec->loopback.amplist = alc662_loopbacks;
> -- 
> 1.7.1
>