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

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

Merge branch 'fix/hda' into for-linus

parents 6e0446cb 6dd7dc76

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -2713,6 +2713,9 @@ static struct pci_device_id azx_ids[] = { 
	{ PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0be2), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0be3), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0be4), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0d94), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0d95), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0d96), .driver_data = AZX_DRIVER_NVIDIA },

sound/pci/hda/patch_analog.c

+8 −0
Original line number Diff line number Diff line
@@ -1789,6 +1789,14 @@ static int patch_ad1981(struct hda_codec *codec) 


		codec->patch_ops.init = ad1981_hp_init;

		codec->patch_ops.unsol_event = ad1981_hp_unsol_event;

		/* set the upper-limit for mixer amp to 0dB for avoiding the

		 * possible damage by overloading

		 */

		snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,

					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) |

					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |

					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |

					  (1 << AC_AMPCAP_MUTE_SHIFT));

		break;

	case AD1981_THINKPAD:

		spec->mixers[0] = ad1981_thinkpad_mixers;

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -6248,6 +6248,7 @@ static const char *alc260_models[ALC260_MODEL_LAST] = { 








static struct snd_pci_quirk alc260_cfg_tbl[] = {









	SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),









	SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),









	SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),









	SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),









	SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),