Merge branch 'fix/hda' into topic/hda (5e09416f) · Commits · e / devices / android_kernel_teracube_2e

sound/pci/hda/patch_analog.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3642,6 +3642,7 @@ static struct snd_pci_quirk ad1984_cfg_tbl[] = {
		/* Lenovo Thinkpad T61/X61 */
		SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD),
		SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP),
		SND_PCI_QUIRK(0x1028, 0x0233, "Dell Latitude E6400", AD1984_DELL_DESKTOP),
		{}
		};

+10 −0

Original line number	Diff line number	Diff line
		@@ -14710,6 +14710,7 @@ static int alc269_resume(struct hda_codec *codec)

		enum {
		ALC269_FIXUP_SONY_VAIO,
		ALC269_FIXUP_DELL_M101Z,
		};

		static const struct alc_fixup alc269_fixups[] = {
		@@ -14719,11 +14720,20 @@ static const struct alc_fixup alc269_fixups[] = {
		{}
		}
		},
		[ALC269_FIXUP_DELL_M101Z] = {
		.verbs = (const struct hda_verb[]) {
		/* Enables internal speaker */
		{0x20, AC_VERB_SET_COEF_INDEX, 13},
		{0x20, AC_VERB_SET_PROC_COEF, 0x4040},
		{}
		}
		},
		};

		static struct snd_pci_quirk alc269_fixup_tbl[] = {
		SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
		SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
		SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
		{}
		};