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

Commit 045e3d2f authored by Kailang Yang's avatar Kailang Yang Committed by Greg Kroah-Hartman
Browse files

ALSA: hda/realtek - Disable headset Mic VREF for headset mode of ALC225 



commit d1dd42110d2727e81b9265841a62bc84c454c3a2 upstream.

Disable Headset Mic VREF for headset mode of ALC225.
This will be controlled by coef bits of headset mode functions.

[ Fixed a compile warning and code simplification -- tiwai ]

Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0fd36f02

sound/pci/hda/patch_realtek.c

+15 −1
Original line number Diff line number Diff line
@@ -5381,6 +5381,13 @@ static void alc285_fixup_invalidate_dacs(struct hda_codec *codec, 
	snd_hda_override_wcaps(codec, 0x03, 0);

}



static void alc_fixup_disable_mic_vref(struct hda_codec *codec,

				  const struct hda_fixup *fix, int action)

{

	if (action == HDA_FIXUP_ACT_PRE_PROBE)

		snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);

}



/* for hda_fixup_thinkpad_acpi() */

#include "thinkpad_helper.c"
@@ -5493,6 +5500,7 @@ enum { 
	ALC293_FIXUP_LENOVO_SPK_NOISE,

	ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,

	ALC255_FIXUP_DELL_SPK_NOISE,

	ALC225_FIXUP_DISABLE_MIC_VREF,

	ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,

	ALC295_FIXUP_DISABLE_DAC3,

	ALC280_FIXUP_HP_HEADSET_MIC,
@@ -6192,6 +6200,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE

	},

	[ALC225_FIXUP_DISABLE_MIC_VREF] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_disable_mic_vref,

		.chained = true,

		.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE

	},

	[ALC225_FIXUP_DELL1_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {
@@ -6201,7 +6215,7 @@ static const struct hda_fixup alc269_fixups[] = { 
			{}

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE

		.chain_id = ALC225_FIXUP_DISABLE_MIC_VREF

	},

	[ALC280_FIXUP_HP_HEADSET_MIC] = {

		.type = HDA_FIXUP_FUNC,