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

Commit a7fe850d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Three trivial oneliner fixes for HD-audio.

  Two are device-specific quirks while one is a generic fix for recent
  Realtek codecs"

* tag 'sound-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add one more node in the EAPD supporting candidate list
  ALSA: hda_intel: apply the Seperate stream_tag for Sunrise Point
  ALSA: hda - Add dock support for Thinkpad T450s (17aa:5036)
parents 3c435c1e af95b414

sound/pci/hda/hda_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -1989,7 +1989,7 @@ static const struct pci_device_id azx_ids[] = { 
	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	/* Sunrise Point */

	{ PCI_DEVICE(0x8086, 0xa170),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },

	/* Sunrise Point-LP */

	{ PCI_DEVICE(0x8086, 0x9d70),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },

sound/pci/hda/patch_realtek.c

+2 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static void alc_auto_setup_eapd(struct hda_codec *codec, bool on) 
{

	/* We currently only handle front, HP */

	static hda_nid_t pins[] = {

		0x0f, 0x10, 0x14, 0x15, 0

		0x0f, 0x10, 0x14, 0x15, 0x17, 0

	};

	hda_nid_t *p;

	for (p = pins; *p; p++)
@@ -5036,6 +5036,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC),

	SND_PCI_QUIRK(0x17aa, 0x501e, "Thinkpad L440", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x5026, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),

	SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),