ALSA: hda/realtek - Rewrite ALC880 model=uniwill with auto-parser

The model=uniwill would work almost as is, but a couple of adjustments are needed to make the mutli-io working correctly. The headphone and speaker pins have to be marked properly in pin configs. Signed-off-by: Takashi Iwai <tiwai@suse.de>

ALSA: hda/realtek - Rewrite ALC880 model=uniwill with auto-parser
The model=uniwill would work almost as is, but a couple of adjustments are needed to make the mutli-io working correctly. The headphone and speaker pins have to be marked properly in pin configs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai
1 parent 7833c7e8b4
Showing 4 changed files with 12 additions and 131 deletions Side-by-side Diff
Documentation/sound/alsa/HD-Audio-Models.txt
sound/pci/hda/alc880_quirks.c
sound/pci/hda/alc_quirks.c
sound/pci/hda/patch_realtek.c
@@ -13,7 +13,6 @@
   asus-w1v	ASUS W1V
   asus-dig	ASUS with SPDIF out
   asus-dig2	ASUS with SPDIF out (using GPIO2)
-  uniwill	3-jack
   test		for testing/debugging purpose, almost all controls can be
 		adjusted.  Appearing only when compiled with
 		$CONFIG_SND_DEBUG=y
@@ -18,7 +18,6 @@
 	ALC880_ASUS_W1V,
 	ALC880_ASUS_DIG2,
 	ALC880_UNIWILL_DIG,
-	ALC880_UNIWILL,
 #ifdef CONFIG_SND_DEBUG
 	ALC880_TEST,
 #endif
@@ -306,34 +305,6 @@
 	{ } /* end */
 };
  
-/* Uniwill */
-static const struct snd_kcontrol_new alc880_uniwill_mixer[] = {
-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 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("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, 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("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, 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 */
-};
-
 /*
  * initialize the codec volumes, etc
  */
  
@@ -518,83 +489,11 @@
 	{ }
 };
  
-/*
- * Uniwill pin configuration:
- * HP = 0x14, InternalSpeaker = 0x15, mic = 0x18, internal mic = 0x19,
- * line = 0x1a
- */
-static const struct hda_verb alc880_uniwill_init_verbs[] = {
-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
-
-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-	{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},
-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-
-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-	/* {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, */
-	/* {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, */
-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-
-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_MIC_EVENT},
-
-	{ }
-};
-
 static const struct hda_verb alc880_beep_init_verbs[] = {
 	{ 0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5) },
 	{ }
 };
  
-static void alc880_uniwill_setup(struct hda_codec *codec)
-{
-	struct alc_spec *spec = codec->spec;
-
-	spec->autocfg.hp_pins[0] = 0x14;
-	spec->autocfg.speaker_pins[0] = 0x15;
-	spec->autocfg.speaker_pins[0] = 0x16;
-	alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP);
-}
-
-static void alc880_uniwill_init_hook(struct hda_codec *codec)
-{
-	alc_hp_automute(codec);
-	alc88x_simple_mic_automute(codec);
-}
-
-static void alc880_uniwill_unsol_event(struct hda_codec *codec,
-				       unsigned int res)
-{
-	/* Looks like the unsol event is incompatible with the standard
-	 * definition.  4bit tag is placed at 28 bit!
-	 */
-	res >>= 28;
-	switch (res) {
-	case ALC_MIC_EVENT:
-		alc88x_simple_mic_automute(codec);
-		break;
-	default:
-		alc_exec_unsol_event(codec, res);
-		break;
-	}
-}
-
 /*
  * ASUS pin configuration:
  * HP/front = 0x14, surr = 0x15, clfe = 0x16, mic = 0x18, line = 0x1a
@@ -911,7 +810,6 @@
 	[ALC880_ASUS_W1V]	= "asus-w1v",
 	[ALC880_ASUS_DIG]	= "asus-dig",
 	[ALC880_ASUS_DIG2]	= "asus-dig2",
-	[ALC880_UNIWILL_DIG]	= "uniwill",
 #ifdef CONFIG_SND_DEBUG
 	[ALC880_TEST]		= "test",
 #endif
@@ -955,7 +853,6 @@
 	SND_PCI_QUIRK(0x1558, 0x5401, "ASUS", ALC880_ASUS_DIG2),
 	SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),
 	SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_UNIWILL_DIG),
-	SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_UNIWILL),
 	SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_5ST_DIG),
 	SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
 	SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_6ST_DIG), /* broken BIOS */
@@ -1122,21 +1019,6 @@
 		.channel_mode = alc880_asus_modes,
 		.need_dac_fix = 1,
 		.input_mux = &alc880_capture_source,
-	},
-	[ALC880_UNIWILL] = {
-		.mixers = { alc880_uniwill_mixer },
-		.init_verbs = { alc880_volume_init_verbs,
-				alc880_uniwill_init_verbs },
-		.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
-		.dac_nids = alc880_asus_dac_nids,
-		.dig_out_nid = ALC880_DIGOUT_NID,
-		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
-		.channel_mode = alc880_threestack_modes,
-		.need_dac_fix = 1,
-		.input_mux = &alc880_capture_source,
-		.unsol_event = alc880_uniwill_unsol_event,
-		.setup = alc880_uniwill_setup,
-		.init_hook = alc880_uniwill_init_hook,
 	},
 #ifdef CONFIG_SND_DEBUG
 	[ALC880_TEST] = {
@@ -165,15 +165,4 @@
 	spec->automute_lo = spec->automute_lo_possible = !!lo_pin;
 	spec->automute_speaker = spec->automute_speaker_possible = !!spec->autocfg.speaker_pins[0];
 }
-
-/* auto-toggle front mic */
-static void alc88x_simple_mic_automute(struct hda_codec *codec)
-{
- 	unsigned int present;
-	unsigned char bits;
-
-	present = snd_hda_jack_detect(codec, 0x18);
-	bits = present ? HDA_AMP_MUTE : 0;
-	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);
-}
@@ -4447,6 +4447,7 @@
 	ALC880_FIXUP_VOL_KNOB,
 	ALC880_FIXUP_FUJITSU,
 	ALC880_FIXUP_F1734,
+	ALC880_FIXUP_UNIWILL,
 };
  
 /* enable the volume-knob widget support on NID 0x21 */
  
@@ -4556,12 +4557,23 @@
 		.chained = true,
 		.chain_id = ALC880_FIXUP_VOL_KNOB,
 	},
+	[ALC880_FIXUP_UNIWILL] = {
+		/* need to fix HP and speaker pins to be parsed correctly */
+		.type = ALC_FIXUP_PINS,
+		.v.pins = (const struct alc_pincfg[]) {
+			{ 0x14, 0x0121411f }, /* HP */
+			{ 0x15, 0x99030120 }, /* speaker */
+			{ 0x16, 0x99030130 }, /* bass speaker */
+			{ }
+		},
+	},
 };
  
 static const struct snd_pci_quirk alc880_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_FIXUP_W810),
 	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo", ALC880_FIXUP_EAPD_COEF),
 	SND_PCI_QUIRK(0x1584, 0x9054, "Uniwill", ALC880_FIXUP_F1734),
+	SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_FIXUP_UNIWILL),
 	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),
 	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),
 	SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),
...	...	@@ -13,7 +13,6 @@
13	13	asus-w1v ASUS W1V
14	14	asus-dig ASUS with SPDIF out
15	15	asus-dig2 ASUS with SPDIF out (using GPIO2)
16		- uniwill 3-jack
17	16	test for testing/debugging purpose, almost all controls can be
18	17	adjusted. Appearing only when compiled with
19	18	$CONFIG_SND_DEBUG=y
...	...	@@ -18,7 +18,6 @@
18	18	ALC880_ASUS_W1V,
19	19	ALC880_ASUS_DIG2,
20	20	ALC880_UNIWILL_DIG,
21		- ALC880_UNIWILL,
22	21	#ifdef CONFIG_SND_DEBUG
23	22	ALC880_TEST,
24	23	#endif
...	...	@@ -306,34 +305,6 @@
306	305	{ } /* end */
307	306	};
308	307
309		-/* Uniwill */
310		-static const struct snd_kcontrol_new alc880_uniwill_mixer[] = {
311		- HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
312		- HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
313		- HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
314		- HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
315		- HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
316		- HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
317		- HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
318		- HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
319		- HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
320		- HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
321		- HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
322		- HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
323		- HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
324		- HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
325		- HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
326		- HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
327		- {
328		- .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
329		- .name = "Channel Mode",
330		- .info = alc_ch_mode_info,
331		- .get = alc_ch_mode_get,
332		- .put = alc_ch_mode_put,
333		- },
334		- { } /* end */
335		-};
336		-
337	308	/*
338	309	* initialize the codec volumes, etc
339	310	*/
340	311
...	...	@@ -518,83 +489,11 @@
518	489	{ }
519	490	};
520	491
521		-/*
522		- * Uniwill pin configuration:
523		- * HP = 0x14, InternalSpeaker = 0x15, mic = 0x18, internal mic = 0x19,
524		- * line = 0x1a
525		- */
526		-static const struct hda_verb alc880_uniwill_init_verbs[] = {
527		- {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
528		-
529		- {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
530		- {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
531		- {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
532		- {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
533		- {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
534		- {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
535		- {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
536		- {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
537		- {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 \| (0x00 << 8))},
538		- {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 \| (0x01 << 8))},
539		- {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 \| (0x00 << 8))},
540		- {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 \| (0x01 << 8))},
541		- {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 \| (0x00 << 8))},
542		- {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 \| (0x01 << 8))},
543		-
544		- {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
545		- {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
546		- {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
547		- {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
548		- {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
549		- {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
550		- /* {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, */
551		- /* {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, */
552		- {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
553		-
554		- {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC_HP_EVENT},
555		- {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC_MIC_EVENT},
556		-
557		- { }
558		-};
559		-
560	492	static const struct hda_verb alc880_beep_init_verbs[] = {
561	493	{ 0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5) },
562	494	{ }
563	495	};
564	496
565		-static void alc880_uniwill_setup(struct hda_codec *codec)
566		-{
567		- struct alc_spec *spec = codec->spec;
568		-
569		- spec->autocfg.hp_pins[0] = 0x14;
570		- spec->autocfg.speaker_pins[0] = 0x15;
571		- spec->autocfg.speaker_pins[0] = 0x16;
572		- alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP);
573		-}
574		-
575		-static void alc880_uniwill_init_hook(struct hda_codec *codec)
576		-{
577		- alc_hp_automute(codec);
578		- alc88x_simple_mic_automute(codec);
579		-}
580		-
581		-static void alc880_uniwill_unsol_event(struct hda_codec *codec,
582		- unsigned int res)
583		-{
584		- /* Looks like the unsol event is incompatible with the standard
585		- * definition. 4bit tag is placed at 28 bit!
586		- */
587		- res >>= 28;
588		- switch (res) {
589		- case ALC_MIC_EVENT:
590		- alc88x_simple_mic_automute(codec);
591		- break;
592		- default:
593		- alc_exec_unsol_event(codec, res);
594		- break;
595		- }
596		-}
597		-
598	497	/*
599	498	* ASUS pin configuration:
600	499	* HP/front = 0x14, surr = 0x15, clfe = 0x16, mic = 0x18, line = 0x1a
...	...	@@ -911,7 +810,6 @@
911	810	[ALC880_ASUS_W1V] = "asus-w1v",
912	811	[ALC880_ASUS_DIG] = "asus-dig",
913	812	[ALC880_ASUS_DIG2] = "asus-dig2",
914		- [ALC880_UNIWILL_DIG] = "uniwill",
915	813	#ifdef CONFIG_SND_DEBUG
916	814	[ALC880_TEST] = "test",
917	815	#endif
...	...	@@ -955,7 +853,6 @@
955	853	SND_PCI_QUIRK(0x1558, 0x5401, "ASUS", ALC880_ASUS_DIG2),
956	854	SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),
957	855	SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_UNIWILL_DIG),
958		- SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_UNIWILL),
959	856	SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_5ST_DIG),
960	857	SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
961	858	SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_6ST_DIG), /* broken BIOS */
...	...	@@ -1122,21 +1019,6 @@
1122	1019	.channel_mode = alc880_asus_modes,
1123	1020	.need_dac_fix = 1,
1124	1021	.input_mux = &alc880_capture_source,
1125		- },
1126		- [ALC880_UNIWILL] = {
1127		- .mixers = { alc880_uniwill_mixer },
1128		- .init_verbs = { alc880_volume_init_verbs,
1129		- alc880_uniwill_init_verbs },
1130		- .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
1131		- .dac_nids = alc880_asus_dac_nids,
1132		- .dig_out_nid = ALC880_DIGOUT_NID,
1133		- .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
1134		- .channel_mode = alc880_threestack_modes,
1135		- .need_dac_fix = 1,
1136		- .input_mux = &alc880_capture_source,
1137		- .unsol_event = alc880_uniwill_unsol_event,
1138		- .setup = alc880_uniwill_setup,
1139		- .init_hook = alc880_uniwill_init_hook,
1140	1022	},
1141	1023	#ifdef CONFIG_SND_DEBUG
1142	1024	[ALC880_TEST] = {
...	...	@@ -165,15 +165,4 @@
165	165	spec->automute_lo = spec->automute_lo_possible = !!lo_pin;
166	166	spec->automute_speaker = spec->automute_speaker_possible = !!spec->autocfg.speaker_pins[0];
167	167	}
168		-
169		-/* auto-toggle front mic */
170		-static void alc88x_simple_mic_automute(struct hda_codec *codec)
171		-{
172		- unsigned int present;
173		- unsigned char bits;
174		-
175		- present = snd_hda_jack_detect(codec, 0x18);
176		- bits = present ? HDA_AMP_MUTE : 0;
177		- snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);
178		-}
...	...	@@ -4447,6 +4447,7 @@
4447	4447	ALC880_FIXUP_VOL_KNOB,
4448	4448	ALC880_FIXUP_FUJITSU,
4449	4449	ALC880_FIXUP_F1734,
	4450	+ ALC880_FIXUP_UNIWILL,
4450	4451	};
4451	4452
4452	4453	/* enable the volume-knob widget support on NID 0x21 */
4453	4454
...	...	@@ -4556,12 +4557,23 @@
4556	4557	.chained = true,
4557	4558	.chain_id = ALC880_FIXUP_VOL_KNOB,
4558	4559	},
	4560	+ [ALC880_FIXUP_UNIWILL] = {
	4561	+ /* need to fix HP and speaker pins to be parsed correctly */
	4562	+ .type = ALC_FIXUP_PINS,
	4563	+ .v.pins = (const struct alc_pincfg[]) {
	4564	+ { 0x14, 0x0121411f }, /* HP */
	4565	+ { 0x15, 0x99030120 }, /* speaker */
	4566	+ { 0x16, 0x99030130 }, /* bass speaker */
	4567	+ { }
	4568	+ },
	4569	+ },
4559	4570	};
4560	4571
4561	4572	static const struct snd_pci_quirk alc880_fixup_tbl[] = {
4562	4573	SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_FIXUP_W810),
4563	4574	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo", ALC880_FIXUP_EAPD_COEF),
4564	4575	SND_PCI_QUIRK(0x1584, 0x9054, "Uniwill", ALC880_FIXUP_F1734),
	4576	+ SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_FIXUP_UNIWILL),
4565	4577	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),
4566	4578	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),
4567	4579	SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),