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

Commit 0604cb3c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents 6a99ad7e 35639a0e

sound/pci/hda/hda_intel.c

+10 −1
Original line number Diff line number Diff line
@@ -365,8 +365,11 @@ enum { 


#define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170)

#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)

#define IS_KBL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa171)

#define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)

#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)

#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci))

#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \

			IS_KBL(pci) || IS_KBL_LP(pci)



static char *driver_short_names[] = {

	[AZX_DRIVER_ICH] = "HDA Intel",
@@ -2181,6 +2184,12 @@ static const struct pci_device_id azx_ids[] = { 
	/* Sunrise Point-LP */

	{ PCI_DEVICE(0x8086, 0x9d70),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },

	/* Kabylake */

	{ PCI_DEVICE(0x8086, 0xa171),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },

	/* Kabylake-LP */

	{ PCI_DEVICE(0x8086, 0x9d71),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },

	/* Broxton-P(Apollolake) */

	{ PCI_DEVICE(0x8086, 0x5a98),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },

sound/pci/hda/patch_realtek.c

+5 −0
Original line number Diff line number Diff line
@@ -5634,6 +5634,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2231, "Thinkpad T560", ALC292_FIXUP_TPT460),

	SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460),

	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
@@ -5822,6 +5823,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x12, 0x90a60180},

		{0x14, 0x90170130},

		{0x21, 0x02211040}),

	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell Inspiron 5565", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x12, 0x90a60180},

		{0x14, 0x90170120},

		{0x21, 0x02211030}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x12, 0x90a60160},

		{0x14, 0x90170120},