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

Commit beac87de authored by Michael Pobega's avatar Michael Pobega Committed by Greg Kroah-Hartman
Browse files

ALSA: hda/sigmatel - Disable automute for Elo VuPoint 



[ Upstream commit d153135e93a50cdb6f1b52e238909e9965b56056 ]

The Elo VuPoint 15MX has two headphone jacks of which neither work by
default. Disabling automute allows ALSA to work normally with the
speakers & left headphone jack.

Future pin configuration changes may be required in the future to get
the right headphone jack working in tandem.

Signed-off-by: default avatarMichael Pobega <mpobega@neverware.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fff92c36

sound/pci/hda/patch_sigmatel.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,7 @@ enum { 
	STAC_DELL_M6_BOTH,

	STAC_DELL_M6_BOTH,

	STAC_DELL_EQ,

	STAC_DELL_EQ,

	STAC_ALIENWARE_M17X,

	STAC_ALIENWARE_M17X,

	STAC_ELO_VUPOINT_15MX,

	STAC_92HD89XX_HP_FRONT_JACK,

	STAC_92HD89XX_HP_FRONT_JACK,

	STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK,

	STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK,

	STAC_92HD73XX_ASUS_MOBO,

	STAC_92HD73XX_ASUS_MOBO,
@@ -1875,6 +1876,18 @@ static void stac92hd73xx_fixup_no_jd(struct hda_codec *codec, 
		codec->no_jack_detect = 1;

		codec->no_jack_detect = 1;

}

}







static void stac92hd73xx_disable_automute(struct hda_codec *codec,

				     const struct hda_fixup *fix, int action)

{

	struct sigmatel_spec *spec = codec->spec;



	if (action != HDA_FIXUP_ACT_PRE_PROBE)

		return;



	spec->gen.suppress_auto_mute = 1;

}



static const struct hda_fixup stac92hd73xx_fixups[] = {

static const struct hda_fixup stac92hd73xx_fixups[] = {

	[STAC_92HD73XX_REF] = {

	[STAC_92HD73XX_REF] = {

		.type = HDA_FIXUP_FUNC,

		.type = HDA_FIXUP_FUNC,
@@ -1900,6 +1913,10 @@ static const struct hda_fixup stac92hd73xx_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.type = HDA_FIXUP_FUNC,

		.v.func = stac92hd73xx_fixup_alienware_m17x,

		.v.func = stac92hd73xx_fixup_alienware_m17x,

	},

	},

	[STAC_ELO_VUPOINT_15MX] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = stac92hd73xx_disable_automute,

	},

	[STAC_92HD73XX_INTEL] = {

	[STAC_92HD73XX_INTEL] = {

		.type = HDA_FIXUP_PINS,

		.type = HDA_FIXUP_PINS,

		.v.pins = intel_dg45id_pin_configs,

		.v.pins = intel_dg45id_pin_configs,
@@ -1938,6 +1955,7 @@ static const struct hda_model_fixup stac92hd73xx_models[] = { 
	{ .id = STAC_DELL_M6_BOTH, .name = "dell-m6" },

	{ .id = STAC_DELL_M6_BOTH, .name = "dell-m6" },

	{ .id = STAC_DELL_EQ, .name = "dell-eq" },

	{ .id = STAC_DELL_EQ, .name = "dell-eq" },

	{ .id = STAC_ALIENWARE_M17X, .name = "alienware" },

	{ .id = STAC_ALIENWARE_M17X, .name = "alienware" },

	{ .id = STAC_ELO_VUPOINT_15MX, .name = "elo-vupoint-15mx" },

	{ .id = STAC_92HD73XX_ASUS_MOBO, .name = "asus-mobo" },

	{ .id = STAC_92HD73XX_ASUS_MOBO, .name = "asus-mobo" },

	{}

	{}

};

};
@@ -1987,6 +2005,8 @@ static const struct snd_pci_quirk stac92hd73xx_fixup_tbl[] = { 
		      "Alienware M17x", STAC_ALIENWARE_M17X),

		      "Alienware M17x", STAC_ALIENWARE_M17X),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490,

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490,

		      "Alienware M17x R3", STAC_DELL_EQ),

		      "Alienware M17x R3", STAC_DELL_EQ),

	SND_PCI_QUIRK(0x1059, 0x1011,

		      "ELO VuPoint 15MX", STAC_ELO_VUPOINT_15MX),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1927,

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1927,

				"HP Z1 G2", STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK),

				"HP Z1 G2", STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17,

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17,