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

Commit 6727b126 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Remove ALC861VD Lenovo, Dallas, HP and V1S model quirks 



These are covered by the auto-parser well enough.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1ebec5f2

sound/pci/hda/alc861vd_quirks.c

+0 −217
Original line number Diff line number Diff line
@@ -8,13 +8,9 @@ enum { 
	ALC861VD_AUTO,

	ALC660VD_3ST,

	ALC660VD_3ST_DIG,

	ALC660VD_ASUS_V1S,

	ALC861VD_3ST,

	ALC861VD_3ST_DIG,

	ALC861VD_6ST_DIG,

	ALC861VD_LENOVO,

	ALC861VD_DALLAS,

	ALC861VD_HP,

	ALC861VD_MODEL_LAST,

};
@@ -56,22 +52,6 @@ static const struct hda_input_mux alc861vd_capture_source = { 
	},

};



static const struct hda_input_mux alc861vd_dallas_capture_source = {

	.num_items = 2,

	.items = {

		{ "Mic", 0x0 },

		{ "Internal Mic", 0x1 },

	},

};



static const struct hda_input_mux alc861vd_hp_capture_source = {

	.num_items = 2,

	.items = {

		{ "Front Mic", 0x0 },

		{ "ATAPI Mic", 0x1 },

	},

};



/*

 * 2ch mode

 */
@@ -200,39 +180,6 @@ static const struct snd_kcontrol_new alc861vd_lenovo_mixer[] = { 
	{ } /* end */

};



/* Pin assignment: Speaker=0x14, HP = 0x15,

 *                 Mic=0x18, Internal Mic = 0x19, CD = 0x1c, PC Beep = 0x1d

 */

static const struct snd_kcontrol_new alc861vd_dallas_mixer[] = {

	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT),

	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),

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

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

	HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),

	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),

	{ } /* end */

};



/* Pin assignment: Speaker=0x14, Line-out = 0x15,

 *                 Front Mic=0x18, ATAPI Mic = 0x19,

 */

static const struct snd_kcontrol_new alc861vd_hp_mixer[] = {

	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),

	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),

	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),

	HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),



	{ } /* end */

};



/*

 * generic initialization of ADC, input mixers and output mixers

 */
@@ -363,130 +310,22 @@ static const struct hda_verb alc861vd_eapd_verbs[] = { 
	{ }

};



static const struct hda_verb alc861vd_lenovo_unsol_verbs[] = {

	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

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

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},

	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},

	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_MIC_EVENT},

	{}

};



static void alc861vd_lenovo_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;

	spec->autocfg.hp_pins[0] = 0x1b;

	spec->autocfg.speaker_pins[0] = 0x14;

	spec->automute = 1;

	spec->automute_mode = ALC_AUTOMUTE_AMP;

}



static void alc861vd_lenovo_init_hook(struct hda_codec *codec)

{

	alc_hp_automute(codec);

	alc88x_simple_mic_automute(codec);

}



static void alc861vd_lenovo_unsol_event(struct hda_codec *codec,

					unsigned int res)

{

	switch (res >> 26) {

	case ALC_MIC_EVENT:

		alc88x_simple_mic_automute(codec);

		break;

	default:

		alc_sku_unsol_event(codec, res);

		break;

	}

}



static const struct hda_verb alc861vd_dallas_verbs[] = {

	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},



	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

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

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

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

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

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

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

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



	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},



	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},

	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},

	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},

	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},

	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},

	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},

	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},

	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},



	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

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

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

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



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

	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},



	{ } /* end */

};



/* toggle speaker-output according to the hp-jack state */

static void alc861vd_dallas_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



	spec->autocfg.hp_pins[0] = 0x15;

	spec->autocfg.speaker_pins[0] = 0x14;

	spec->automute = 1;

	spec->automute_mode = ALC_AUTOMUTE_AMP;

}



/*

 * configuration and preset

 */

static const char * const alc861vd_models[ALC861VD_MODEL_LAST] = {

	[ALC660VD_3ST]		= "3stack-660",

	[ALC660VD_3ST_DIG]	= "3stack-660-digout",

	[ALC660VD_ASUS_V1S]	= "asus-v1s",

	[ALC861VD_3ST]		= "3stack",

	[ALC861VD_3ST_DIG]	= "3stack-digout",

	[ALC861VD_6ST_DIG]	= "6stack-digout",

	[ALC861VD_LENOVO]	= "lenovo",

	[ALC861VD_DALLAS]	= "dallas",

	[ALC861VD_HP]		= "hp",

	[ALC861VD_AUTO]		= "auto",

};



static const struct snd_pci_quirk alc861vd_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),

	SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP),

	SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST),

	/*SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST),*/ /* auto */

	SND_PCI_QUIRK(0x1043, 0x1633, "Asus V1Sn", ALC660VD_ASUS_V1S),

	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST_DIG),

	SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST),

	SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba A135", ALC861VD_LENOVO),

	/*SND_PCI_QUIRK(0x1179, 0xff00, "DALLAS", ALC861VD_DALLAS),*/ /*lenovo*/

	SND_PCI_QUIRK(0x1179, 0xff01, "Toshiba A135", ALC861VD_LENOVO),

	SND_PCI_QUIRK(0x1179, 0xff03, "Toshiba P205", ALC861VD_LENOVO),

	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba L30-149", ALC861VD_DALLAS),

	SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG),

	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", ALC861VD_LENOVO),

	SND_PCI_QUIRK(0x1849, 0x0862, "ASRock K8NF6G-VSTA", ALC861VD_6ST_DIG),

	{}

};
@@ -545,61 +384,5 @@ static const struct alc_config_preset alc861vd_presets[] = { 
		.channel_mode = alc861vd_6stack_modes,

		.input_mux = &alc861vd_capture_source,

	},

	[ALC861VD_LENOVO] = {

		.mixers = { alc861vd_lenovo_mixer },

		.init_verbs = { alc861vd_volume_init_verbs,

				alc861vd_3stack_init_verbs,

				alc861vd_eapd_verbs,

				alc861vd_lenovo_unsol_verbs },

		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),

		.dac_nids = alc660vd_dac_nids,

		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),

		.channel_mode = alc861vd_3stack_2ch_modes,

		.input_mux = &alc861vd_capture_source,

		.unsol_event = alc861vd_lenovo_unsol_event,

		.setup = alc861vd_lenovo_setup,

		.init_hook = alc861vd_lenovo_init_hook,

	},

	[ALC861VD_DALLAS] = {

		.mixers = { alc861vd_dallas_mixer },

		.init_verbs = { alc861vd_dallas_verbs },

		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),

		.dac_nids = alc861vd_dac_nids,

		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),

		.channel_mode = alc861vd_3stack_2ch_modes,

		.input_mux = &alc861vd_dallas_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc861vd_dallas_setup,

		.init_hook = alc_hp_automute,

	},

	[ALC861VD_HP] = {

		.mixers = { alc861vd_hp_mixer },

		.init_verbs = { alc861vd_dallas_verbs, alc861vd_eapd_verbs },

		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),

		.dac_nids = alc861vd_dac_nids,

		.dig_out_nid = ALC861VD_DIGOUT_NID,

		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),

		.channel_mode = alc861vd_3stack_2ch_modes,

		.input_mux = &alc861vd_hp_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc861vd_dallas_setup,

		.init_hook = alc_hp_automute,

	},

	[ALC660VD_ASUS_V1S] = {

		.mixers = { alc861vd_lenovo_mixer },

		.init_verbs = { alc861vd_volume_init_verbs,

				alc861vd_3stack_init_verbs,

				alc861vd_eapd_verbs,

				alc861vd_lenovo_unsol_verbs },

		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),

		.dac_nids = alc660vd_dac_nids,

		.dig_out_nid = ALC861VD_DIGOUT_NID,

		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),

		.channel_mode = alc861vd_3stack_2ch_modes,

		.input_mux = &alc861vd_capture_source,

		.unsol_event = alc861vd_lenovo_unsol_event,

		.setup = alc861vd_lenovo_setup,

		.init_hook = alc861vd_lenovo_init_hook,

	},

};