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

Commit 08d7a253 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents 17d857be 3d80dcac

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2303,6 +2303,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev) 
 * white-list for enable_msi

 */

static struct snd_pci_quirk msi_white_list[] __devinitdata = {

	SND_PCI_QUIRK(0x103c, 0x30f7, "HP Pavilion dv4t-1300", 1),

	SND_PCI_QUIRK(0x103c, 0x3607, "HP Compa CQ40", 1),

	{}

};

sound/pci/hda/patch_conexant.c

+11 −1
Original line number Diff line number Diff line
@@ -682,11 +682,13 @@ static struct hda_input_mux cxt5045_capture_source = { 
};



static struct hda_input_mux cxt5045_capture_source_benq = {

	.num_items = 3,

	.num_items = 5,

	.items = {

		{ "IntMic", 0x1 },

		{ "ExtMic", 0x2 },

		{ "LineIn", 0x3 },

		{ "CD",     0x4 },

		{ "Mixer",  0x0 },

	}

};
@@ -811,11 +813,19 @@ static struct snd_kcontrol_new cxt5045_mixers[] = { 
};



static struct snd_kcontrol_new cxt5045_benq_mixers[] = {

	HDA_CODEC_VOLUME("CD Capture Volume", 0x1a, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Capture Switch", 0x1a, 0x04, HDA_INPUT),

	HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x4, HDA_INPUT),



	HDA_CODEC_VOLUME("Line In Capture Volume", 0x1a, 0x03, HDA_INPUT),

	HDA_CODEC_MUTE("Line In Capture Switch", 0x1a, 0x03, HDA_INPUT),

	HDA_CODEC_VOLUME("Line In Playback Volume", 0x17, 0x3, HDA_INPUT),

	HDA_CODEC_MUTE("Line In Playback Switch", 0x17, 0x3, HDA_INPUT),



	HDA_CODEC_VOLUME("Mixer Capture Volume", 0x1a, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Mixer Capture Switch", 0x1a, 0x0, HDA_INPUT),



	{}

};