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

Commit 55440e4e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents 5266874b 5dbd5ec6

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2273,6 +2273,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),

sound/pci/hda/patch_realtek.c

+26 −26
Original line number Diff line number Diff line
@@ -12544,11 +12544,11 @@ static void alc268_aspire_one_speaker_automute(struct hda_codec *codec) 
	unsigned char bits;















	present = snd_hda_jack_detect(codec, 0x15);













	bits = present ? AMP_IN_MUTE(0) : 0;













	bits = present ? HDA_AMP_MUTE : 0;















	snd_hda_codec_amp_stereo(codec, 0x0f, HDA_INPUT, 0,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0f, HDA_INPUT, 1,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















}





























static void alc268_acer_lc_unsol_event(struct hda_codec *codec,










@@ -13567,11 +13567,11 @@ static void alc269_quanta_fl1_speaker_automute(struct hda_codec *codec)













	unsigned char bits;





























	present = snd_hda_jack_detect(codec, 0x15);













	bits = present ? AMP_IN_MUTE(0) : 0;













	bits = present ? HDA_AMP_MUTE : 0;















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,













			AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,













			AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);





























	snd_hda_codec_write(codec, 0x20, 0,















			AC_VERB_SET_COEF_INDEX, 0x0c);









@@ -13596,11 +13596,11 @@ static void alc269_lifebook_speaker_automute(struct hda_codec *codec)













	/* Check port replicator headphone socket */















	present |= snd_hda_jack_detect(codec, 0x1a);



























	bits = present ? AMP_IN_MUTE(0) : 0;













	bits = present ? HDA_AMP_MUTE : 0;















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,













			AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,













			AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);





























	snd_hda_codec_write(codec, 0x20, 0,















			AC_VERB_SET_COEF_INDEX, 0x0c);










@@ -13731,11 +13731,11 @@ static void alc269_speaker_automute(struct hda_codec *codec)













	unsigned char bits;





























	present = snd_hda_jack_detect(codec, nid);













	bits = present ? AMP_IN_MUTE(0) : 0;













	bits = present ? HDA_AMP_MUTE : 0;















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















}





























/* unsolicited event for HP jack sensing */










@@ -17201,9 +17201,9 @@ static void alc663_m51va_speaker_automute(struct hda_codec *codec)













	present = snd_hda_jack_detect(codec, 0x21);















	bits = present ? HDA_AMP_MUTE : 0;















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















}





























static void alc663_21jd_two_speaker_automute(struct hda_codec *codec)









@@ -17214,13 +17214,13 @@ static void alc663_21jd_two_speaker_automute(struct hda_codec *codec)













	present = snd_hda_jack_detect(codec, 0x21);















	bits = present ? HDA_AMP_MUTE : 0;















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 0,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 1,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















}





























static void alc663_15jd_two_speaker_automute(struct hda_codec *codec)









@@ -17231,13 +17231,13 @@ static void alc663_15jd_two_speaker_automute(struct hda_codec *codec)













	present = snd_hda_jack_detect(codec, 0x15);















	bits = present ? HDA_AMP_MUTE : 0;















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 0,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















	snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 1,













				AMP_IN_MUTE(0), bits);













				 HDA_AMP_MUTE, bits);















}





























static void alc662_f5z_speaker_automute(struct hda_codec *codec)










@@ -17276,14 +17276,14 @@ static void alc663_two_hp_m2_speaker_automute(struct hda_codec *codec)



























	if (present1 || present2) {















		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,













				AMP_IN_MUTE(0), AMP_IN_MUTE(0));













					 HDA_AMP_MUTE, HDA_AMP_MUTE);















		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,













				AMP_IN_MUTE(0), AMP_IN_MUTE(0));













					 HDA_AMP_MUTE, HDA_AMP_MUTE);















	} else {















		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,













				AMP_IN_MUTE(0), 0);













					 HDA_AMP_MUTE, 0);















		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,













				AMP_IN_MUTE(0), 0);













					 HDA_AMP_MUTE, 0);















	}















}