Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e08988 authored by Aristeu Sergio Rozanski Filho's avatar Aristeu Sergio Rozanski Filho Committed by Takashi Iwai
Browse files

ALSA: hda: add quirk for Lenovo X200 laptop dock 



Currently the HP connector on X200 dock doesn't detect when a HP is connected
nor allows sound to be played using it. This patch fixes the problem by adding
a quirk for this specific model. It's possible that others have the same NID
(0x19) to report when dock HP is connected, but I don't have access to any.
Please Cc me in the reply since I'm not subscribed to alsa-devel@.

Signed-off-by: default avatarAristeu Rozanski <aris@redhat.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8bb0ac55

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ Conexant 5051 
=============

  laptop	Basic Laptop config (default)

  hp		HP Spartan laptop

  lenovo-x200	Lenovo X200 laptop



STAC9200

========

sound/pci/hda/patch_conexant.c

+40 −0
Original line number Diff line number Diff line
@@ -1798,6 +1798,40 @@ static struct hda_verb cxt5051_init_verbs[] = { 
	{ } /* end */

};



static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = {

	/* Line in, Mic */

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},

	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},

	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},

	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},

	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},

	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},

	/* SPK  */

	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},

	/* HP, Amp  */

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00},

	/* Docking HP */

	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x19, AC_VERB_SET_CONNECT_SEL, 0x00},

	/* DAC1 */

	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* Record selector: Int mic */

	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},

	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},

	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},

	/* SPDIF route: PCM */

	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x0},

	/* EAPD */

	{0x1a, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */

	{0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},

	{0x17, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTB_EVENT},

	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTC_EVENT},

	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},

	{ } /* end */

};



/* initialize jack-sensing, too */

static int cxt5051_init(struct hda_codec *codec)

{
@@ -1815,18 +1849,21 @@ static int cxt5051_init(struct hda_codec *codec) 
enum {

	CXT5051_LAPTOP,	 /* Laptops w/ EAPD support */

	CXT5051_HP,	/* no docking */

	CXT5051_LENOVO_X200,	/* Lenovo X200 laptop */

	CXT5051_MODELS

};



static const char *cxt5051_models[CXT5051_MODELS] = {

	[CXT5051_LAPTOP]	= "laptop",

	[CXT5051_HP]		= "hp",

	[CXT5051_LENOVO_X200]	= "lenovo-x200",

};



static struct snd_pci_quirk cxt5051_cfg_tbl[] = {

	SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",

		      CXT5051_LAPTOP),

	SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT5051_LENOVO_X200),

	{}

};
@@ -1867,6 +1904,9 @@ static int patch_cxt5051(struct hda_codec *codec) 
		codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;

		spec->mixers[0] = cxt5051_hp_mixers;

		break;

	case CXT5051_LENOVO_X200:

		spec->init_verbs[0] = cxt5051_lenovo_x200_init_verbs;

		/* fallthru */

	default:

	case CXT5051_LAPTOP:

		codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;