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

Commit 19723079 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/realtek - Move ALC880 model=lg-lw to auto-parser 



ALC880 model=lg-lw works fine with the auto-parser as is.

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

sound/pci/hda/alc880_quirks.c

+0 −103
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ enum { 
	ALC880_CLEVO,

	ALC880_TCL_S700,

	ALC880_LG,

	ALC880_LG_LW,

#ifdef CONFIG_SND_DEBUG

	ALC880_TEST,

#endif
@@ -1051,91 +1050,6 @@ static void alc880_lg_setup(struct hda_codec *codec) 
	alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP);

}



/*

 * LG LW20

 *

 * Pin assignment:

 *   Speaker-out: 0x14

 *   Mic-In: 0x18

 *   Built-in Mic-In: 0x19

 *   Line-In: 0x1b

 *   HP-Out: 0x1a

 *   SPDIF-Out: 0x1e

 */



static const struct hda_input_mux alc880_lg_lw_capture_source = {

	.num_items = 3,

	.items = {

		{ "Mic", 0x0 },

		{ "Internal Mic", 0x1 },

		{ "Line In", 0x2 },

	},

};



#define alc880_lg_lw_modes alc880_threestack_modes



static const struct snd_kcontrol_new alc880_lg_lw_mixer[] = {

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

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

	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("Surround Playback Switch", 0x0f, 2, HDA_INPUT),

	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),

	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),

	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, 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 Playback Volume", 0x0b, 0x01, HDA_INPUT),

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

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Channel Mode",

		.info = alc_ch_mode_info,

		.get = alc_ch_mode_get,

		.put = alc_ch_mode_put,

	},

	{ } /* end */

};



static const struct hda_verb alc880_lg_lw_init_verbs[] = {

	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */

	{0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */

	{0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */



	/* set capture source to mic-in */

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

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

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

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

	/* speaker-out */

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* HP-out */

	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* mic-in to input */

	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},

	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* built-in mic */

	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},

	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* jack sense */

	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},

	{ }

};



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

static void alc880_lg_lw_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



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

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

	alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP);

}



#ifdef CONFIG_SND_HDA_POWER_SAVE

static const struct hda_amp_list alc880_lg_loopbacks[] = {

	{ 0x0b, HDA_INPUT, 1 },
@@ -1432,7 +1346,6 @@ static const char * const alc880_models[ALC880_MODEL_LAST] = { 
	[ALC880_FUJITSU]	= "fujitsu",

	[ALC880_F1734]		= "F1734",

	[ALC880_LG]		= "lg",

	[ALC880_LG_LW]		= "lg-lw",

#ifdef CONFIG_SND_DEBUG

	[ALC880_TEST]		= "test",

#endif
@@ -1489,11 +1402,9 @@ static const struct snd_pci_quirk alc880_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FUJITSU),

	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_F1734),

	SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU),

	SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),

	SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),

	SND_PCI_QUIRK(0x1854, 0x005f, "LG P1 Express", ALC880_LG),

	SND_PCI_QUIRK(0x1854, 0x0068, "LG w1", ALC880_LG),

	SND_PCI_QUIRK(0x1854, 0x0077, "LG LW25", ALC880_LG_LW),

	SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_TCL_S700),

	SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_6ST_DIG), /* broken BIOS */

	SND_PCI_QUIRK(0x8086, 0x2668, NULL, ALC880_6ST_DIG),
@@ -1773,20 +1684,6 @@ static const struct alc_config_preset alc880_presets[] = { 
		.loopbacks = alc880_lg_loopbacks,

#endif

	},

	[ALC880_LG_LW] = {

		.mixers = { alc880_lg_lw_mixer },

		.init_verbs = { alc880_volume_init_verbs,

				alc880_lg_lw_init_verbs },

		.num_dacs = ARRAY_SIZE(alc880_dac_nids),

		.dac_nids = alc880_dac_nids,

		.dig_out_nid = ALC880_DIGOUT_NID,

		.num_channel_mode = ARRAY_SIZE(alc880_lg_lw_modes),

		.channel_mode = alc880_lg_lw_modes,

		.input_mux = &alc880_lg_lw_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc880_lg_lw_setup,

		.init_hook = alc_hp_automute,

	},

#ifdef CONFIG_SND_DEBUG

	[ALC880_TEST] = {

		.mixers = { alc880_test_mixer },