Commit 937b4160 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

[ALSA] hda-codec - Fix ALC880 F1734 model 



Fixed some issues with ALC880 F1734 model
 - fix capture via mic
 - enable volume-wheel control

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fdafad6f

sound/pci/hda/patch_realtek.c

+16 −3
Original line number Diff line number Diff line
@@ -1320,11 +1320,19 @@ static struct snd_kcontrol_new alc880_f1734_mixer[] = { 
	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),

	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),

	{ } /* end */

};



static struct hda_input_mux alc880_f1734_capture_source = {

	.num_items = 2,

	.items = {

		{ "Mic", 0x1 },

		{ "CD", 0x4 },

	},

};





/*

 * ALC880 ASUS model
@@ -1936,6 +1944,9 @@ static struct hda_verb alc880_pin_f1734_init_verbs[] = { 
	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},



	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},

	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_DCVOL_EVENT},



	{ }

};
@@ -3059,7 +3070,9 @@ static struct alc_config_preset alc880_presets[] = { 
		.hp_nid = 0x02,

		.num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),

		.channel_mode = alc880_2_jack_modes,

		.input_mux = &alc880_capture_source,

		.input_mux = &alc880_f1734_capture_source,

		.unsol_event = alc880_uniwill_p53_unsol_event,

		.init_hook = alc880_uniwill_p53_hp_automute,

	},

	[ALC880_ASUS] = {

		.mixers = { alc880_asus_mixer },