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

Commit a68f20ef authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/acer-alc889-fix' into fix/hda 

Conflicts:
	sound/pci/hda/patch_realtek.c

Merged back the fix for Acer Aspire 6935 with ALC889 codec.
The fix commit was based on 3.2 kernel so that it can be applied to
stable kernel cleanly.
parents fc1156c0 02a237b2

sound/pci/hda/patch_realtek.c

+23 −0
Original line number Diff line number Diff line
@@ -4374,6 +4374,7 @@ enum { 
	ALC882_FIXUP_ACER_ASPIRE_8930G,

	ALC882_FIXUP_ASPIRE_8930G_VERBS,

	ALC885_FIXUP_MACPRO_GPIO,

	ALC889_FIXUP_DAC_ROUTE,

};



static void alc889_fixup_coef(struct hda_codec *codec,
@@ -4427,6 +4428,23 @@ static void alc885_fixup_macpro_gpio(struct hda_codec *codec, 
	alc882_gpio_mute(codec, 1, 0);

}



/* Fix the connection of some pins for ALC889:

 * At least, Acer Aspire 5935 shows the connections to DAC3/4 don't

 * work correctly (bko#42740)

 */

static void alc889_fixup_dac_route(struct hda_codec *codec,

				   const struct alc_fixup *fix, int action)

{

	if (action == ALC_FIXUP_ACT_PRE_PROBE) {

		hda_nid_t conn1[2] = { 0x0c, 0x0d };

		hda_nid_t conn2[2] = { 0x0e, 0x0f };

		snd_hda_override_conn_list(codec, 0x14, 2, conn1);

		snd_hda_override_conn_list(codec, 0x15, 2, conn1);

		snd_hda_override_conn_list(codec, 0x18, 2, conn2);

		snd_hda_override_conn_list(codec, 0x1a, 2, conn2);

	}

}



static const struct alc_fixup alc882_fixups[] = {

	[ALC882_FIXUP_ABIT_AW9D_MAX] = {

		.type = ALC_FIXUP_PINS,
@@ -4574,6 +4592,10 @@ static const struct alc_fixup alc882_fixups[] = { 
		.type = ALC_FIXUP_FUNC,

		.v.func = alc885_fixup_macpro_gpio,

	},

	[ALC889_FIXUP_DAC_ROUTE] = {

		.type = ALC_FIXUP_FUNC,

		.v.func = alc889_fixup_dac_route,

	},

};



static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -4598,6 +4620,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G",

		      ALC882_FIXUP_ACER_ASPIRE_4930G),

	SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", ALC882_FIXUP_PB_M5210),

	SND_PCI_QUIRK(0x1025, 0x0259, "Acer Aspire 5935", ALC889_FIXUP_DAC_ROUTE),

	SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", ALC882_FIXUP_ACER_ASPIRE_7736),

	SND_PCI_QUIRK(0x1043, 0x13c2, "Asus A7M", ALC882_FIXUP_EAPD),

	SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V),