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

Commit 1c11ce81 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents fdbc6626 ae709440

sound/pci/hda/patch_analog.c

+4 −2
Original line number Diff line number Diff line
@@ -3836,9 +3836,11 @@ static struct hda_verb ad1884a_laptop_verbs[] = { 
	/* Port-F (int speaker) mixer - route only from analog mixer */

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},

	/* Port-F pin */

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	/* Port-F (int speaker) pin */

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},

	/* required for compaq 6530s/6531s speaker output */

	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	/* Port-C pin - internal mic-in */

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},

	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */

sound/pci/hda/patch_sigmatel.c

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ enum { 
	STAC_92HD73XX_AUTO,

	STAC_92HD73XX_NO_JD, /* no jack-detection */

	STAC_92HD73XX_REF,

	STAC_92HD73XX_INTEL,

	STAC_DELL_M6_AMIC,

	STAC_DELL_M6_DMIC,

	STAC_DELL_M6_BOTH,
@@ -1746,6 +1747,7 @@ static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { 
	[STAC_92HD73XX_AUTO] = "auto",

	[STAC_92HD73XX_NO_JD] = "no-jd",

	[STAC_92HD73XX_REF] = "ref",

	[STAC_92HD73XX_INTEL] = "intel",

	[STAC_DELL_M6_AMIC] = "dell-m6-amic",

	[STAC_DELL_M6_DMIC] = "dell-m6-dmic",

	[STAC_DELL_M6_BOTH] = "dell-m6",
@@ -1758,6 +1760,10 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { 
				"DFI LanParty", STAC_92HD73XX_REF),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,

				"DFI LanParty", STAC_92HD73XX_REF),

	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002,

				"Intel DG45ID", STAC_92HD73XX_INTEL),

	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5003,

				"Intel DG45FC", STAC_92HD73XX_INTEL),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,

				"Dell Studio 1535", STAC_DELL_M6_DMIC),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,