[PATCH] ALSA: hda - fix headset mic detection problem for one more machine

[PATCH] ALSA: hda - fix headset mic detection problem for one more machine

[Hui Wang]

We have two machines with alc256 codec in the pin quirk table, so
moving the common pins to ALC256_STANDARD_PINS.

Cc: stable@vger.kernel.org
BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1447909
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 sound/pci/hda/patch_realtek.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 03975d03..2a72da7 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5228,6 +5228,16 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
 	{0x1b, 0x411111f0}, \
 	{0x1e, 0x411111f0}
 
+#define ALC256_STANDARD_PINS \
+	{0x12, 0x90a60140}, \
+	{0x14, 0x90170110}, \
+	{0x19, 0x411111f0}, \
+	{0x1a, 0x411111f0}, \
+	{0x1b, 0x411111f0}, \
+	{0x1d, 0x40700001}, \
+	{0x1e, 0x411111f0}, \
+	{0x21, 0x02211020}
+
 #define ALC282_STANDARD_PINS \
 	{0x14, 0x90170110}, \
 	{0x18, 0x411111f0}, \
@@ -5328,15 +5338,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
 		{0x1d, 0x40700001},
 		{0x21, 0x02211050}),
 	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
-		{0x12, 0x90a60140},
-		{0x13, 0x40000000},
-		{0x14, 0x90170110},
-		{0x19, 0x411111f0},
-		{0x1a, 0x411111f0},
-		{0x1b, 0x411111f0},
-		{0x1d, 0x40700001},
-		{0x1e, 0x411111f0},
-		{0x21, 0x02211020}),
+		ALC256_STANDARD_PINS,
+		{0x13, 0x40000000}),
+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+		ALC256_STANDARD_PINS,
+		{0x13, 0x411111f0}),
 	SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,
 		{0x12, 0x90a60130},
 		{0x13, 0x40000000},
-- 
1.9.1

Re: [PATCH] ALSA: hda - fix headset mic detection problem for one more machine

[Takashi Iwai]

At Fri, 24 Apr 2015 13:39:59 +0800,
Hui Wang wrote:
> 
> We have two machines with alc256 codec in the pin quirk table, so
> moving the common pins to ALC256_STANDARD_PINS.
> 
> Cc: stable@vger.kernel.org
> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1447909
> Signed-off-by: Hui Wang <hui.wang@canonical.com>

Applied, thanks.


Takashi

> ---
>  sound/pci/hda/patch_realtek.c | 24 +++++++++++++++---------
>  1 file changed, 15 insertions(+), 9 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 03975d03..2a72da7 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -5228,6 +5228,16 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
>  	{0x1b, 0x411111f0}, \
>  	{0x1e, 0x411111f0}
>  
> +#define ALC256_STANDARD_PINS \
> +	{0x12, 0x90a60140}, \
> +	{0x14, 0x90170110}, \
> +	{0x19, 0x411111f0}, \
> +	{0x1a, 0x411111f0}, \
> +	{0x1b, 0x411111f0}, \
> +	{0x1d, 0x40700001}, \
> +	{0x1e, 0x411111f0}, \
> +	{0x21, 0x02211020}
> +
>  #define ALC282_STANDARD_PINS \
>  	{0x14, 0x90170110}, \
>  	{0x18, 0x411111f0}, \
> @@ -5328,15 +5338,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
>  		{0x1d, 0x40700001},
>  		{0x21, 0x02211050}),
>  	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
> -		{0x12, 0x90a60140},
> -		{0x13, 0x40000000},
> -		{0x14, 0x90170110},
> -		{0x19, 0x411111f0},
> -		{0x1a, 0x411111f0},
> -		{0x1b, 0x411111f0},
> -		{0x1d, 0x40700001},
> -		{0x1e, 0x411111f0},
> -		{0x21, 0x02211020}),
> +		ALC256_STANDARD_PINS,
> +		{0x13, 0x40000000}),
> +	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
> +		ALC256_STANDARD_PINS,
> +		{0x13, 0x411111f0}),
>  	SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,
>  		{0x12, 0x90a60130},
>  		{0x13, 0x40000000},
> -- 
> 1.9.1
>