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

Merge branch 'for-linus' into for-next 

* for-linus:
  ALSA: hda - Add models for Dell headset jacks
parents da177dd0 e32aa85a

Documentation/sound/alsa/HD-Audio-Models.txt

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ ALC269/270/275/276/280/282 
  alc271-dmic	Enable ALC271X digital mic workaround

  inv-dmic	Inverted internal mic workaround

  lenovo-dock   Enables docking station I/O for some Lenovos

  dell-headset-multi	Headset jack, which can also be used as mic-in

  dell-headset-dock	Headset jack (without mic-in), and also dock I/O



ALC662/663/272

==============
@@ -42,6 +44,7 @@ ALC662/663/272 
  asus-mode7	ASUS

  asus-mode8	ASUS

  inv-dmic	Inverted internal mic workaround

  dell-headset-multi	Headset jack, which can also be used as mic-in



ALC680

======

sound/pci/hda/patch_realtek.c

+3 −0
Original line number Diff line number Diff line
@@ -3610,6 +3610,8 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"},

	{.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},

	{.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},

	{.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},

	{.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"},

	{}

};
@@ -4289,6 +4291,7 @@ static const struct hda_model_fixup alc662_fixup_models[] = { 
	{.id = ALC662_FIXUP_ASUS_MODE7, .name = "asus-mode7"},

	{.id = ALC662_FIXUP_ASUS_MODE8, .name = "asus-mode8"},

	{.id = ALC662_FIXUP_INV_DMIC, .name = "inv-dmic"},

	{.id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE, .name = "dell-headset-multi"},

	{}

};