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

Commit c8229c38 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-codec - Fix Conexant 5045 volumes 



Fixed the init verbs and added the missing volume controls so that
the driver works again with Conexant 5045 codec chip.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 9a2a763e

sound/pci/hda/patch_conexant.c

+19 −14
Original line number Original line Diff line number Diff line
@@ -554,10 +554,16 @@ static struct snd_kcontrol_new cxt5045_mixers[] = { 
		.get = conexant_mux_enum_get,

		.get = conexant_mux_enum_get,

		.put = conexant_mux_enum_put

		.put = conexant_mux_enum_put

	},

	},

	HDA_CODEC_VOLUME("Int Mic Volume", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Int Mic Switch", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("Ext Mic Volume", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Ext Mic Switch", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x17, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x17, 0x1, HDA_INPUT),

	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x2, HDA_INPUT),

	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x2, HDA_INPUT),

	HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),

	HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),

	{

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -576,16 +582,15 @@ static struct hda_verb cxt5045_init_verbs[] = { 
	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },

	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },

	/* HP, Amp  */

	/* HP, Amp  */

	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x10, AC_VERB_SET_CONNECT_SEL, 0x1},

	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x17, AC_VERB_SET_CONNECT_SEL,0x01},

	{0x11, AC_VERB_SET_CONNECT_SEL, 0x1},

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE,

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x01},

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE,

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

	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x02},

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

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE,

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

	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03},

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE,

	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x04},

	/* Record selector: Int mic */

	/* Record selector: Int mic */

	{0x1a, AC_VERB_SET_CONNECT_SEL,0x1},

	{0x1a, AC_VERB_SET_CONNECT_SEL,0x1},

	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE,

	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE,