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

Commit 8fda43c1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents 2d0a1dbf b8f171e7

sound/pci/hda/patch_realtek.c

+18 −17
Original line number Diff line number Diff line
@@ -2619,6 +2619,7 @@ static int alc_build_controls(struct hda_codec *codec) 
	}















	/* assign Capture Source enums to NID */













	if (spec->capsrc_nids || spec->adc_nids) {















		kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");















		if (!kctl)















			kctl = snd_hda_find_mixer_ctl(codec, "Input Source");









@@ -2630,6 +2631,7 @@ static int alc_build_controls(struct hda_codec *codec)













			if (err < 0)















				return err;















		}













	}















	if (spec->cap_mixer) {















		const char *kname = kctl ? kctl->id.name : NULL;















		for (knew = spec->cap_mixer; knew->name; knew++) {










@@ -6948,7 +6950,7 @@ static struct hda_input_mux mb5_capture_source = {













	.num_items = 3,















	.items = {















		{ "Mic", 0x1 },













		{ "Line", 0x2 },













		{ "Line", 0x7 },















		{ "CD", 0x4 },















	},















};










@@ -7469,8 +7471,8 @@ static struct snd_kcontrol_new alc885_mb5_mixer[] = {













	HDA_BIND_MUTE   ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT),















	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0f, 0x00, HDA_OUTPUT),















	HDA_BIND_MUTE   ("Headphone Playback Switch", 0x0f, 0x02, HDA_INPUT),













	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),













	HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),













	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x07, HDA_INPUT),













	HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x07, HDA_INPUT),















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















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















	HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT),










@@ -7853,10 +7855,9 @@ static struct hda_verb alc885_mb5_init_verbs[] = {













	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},















	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},



























	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},













	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},













	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},













	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},













	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0x1)},













	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0x7)},













	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0x4)},















	{ }















};