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

Commit b7589ceb authored by Tobin Davis's avatar Tobin Davis Committed by Jaroslav Kysela
Browse files

[ALSA] HDA-Intel: Fix headphone squeal on Conexant audio 



This patch fixes the headphone squeal and noise on Conexant CX20551
(Waikiki) audio.

Signed-off-by: default avatarTobin Davis <gruemaster@email.uophx.edu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent c5a30f85

sound/pci/hda/patch_conexant.c

+6 −17
Original line number Original line Diff line number Diff line
@@ -993,22 +993,10 @@ static struct snd_kcontrol_new cxt5047_mixers[] = { 
	HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),

	HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),

	HDA_CODEC_VOLUME("PCM-2 Volume", 0x1c, 0x00, HDA_OUTPUT),

	HDA_CODEC_VOLUME("PCM-2 Volume", 0x1c, 0x00, HDA_OUTPUT),

	HDA_CODEC_MUTE("PCM-2 Switch", 0x1c, 0x00, HDA_OUTPUT),

	HDA_CODEC_MUTE("PCM-2 Switch", 0x1c, 0x00, HDA_OUTPUT),

	{

	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x00, HDA_OUTPUT),

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	HDA_CODEC_MUTE("Speaker Playback Switch", 0x1d, 0x00, HDA_OUTPUT),

		.name = "Master Playback Volume",

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

		.info = snd_hda_mixer_amp_volume_info,

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x13, 0x00, HDA_OUTPUT),

		.get = snd_hda_mixer_amp_volume_get,

		.put = cxt5047_hp_master_vol_put,

		.private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),

	},

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",

		.info = cxt_eapd_info,

		.get = cxt_eapd_get,

		.put = cxt5047_hp_master_sw_put,

		.private_value = 0x13,

	},





	{}

	{}

};

};
@@ -1079,7 +1067,8 @@ static struct hda_verb cxt5047_init_verbs[] = { 
	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },

	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },

	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },

	/* HP, Speaker  */

	/* HP, Speaker  */

	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },

	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },

	{0x13, AC_VERB_SET_CONNECT_SEL,0x1},

	{0x1d, AC_VERB_SET_CONNECT_SEL,0x0},

	{0x1d, AC_VERB_SET_CONNECT_SEL,0x0},

	/* Record selector: Mic */

	/* Record selector: Mic */

	{0x12, AC_VERB_SET_CONNECT_SEL,0x03},

	{0x12, AC_VERB_SET_CONNECT_SEL,0x03},