diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-11-07 06:57:16 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-11-08 02:59:35 -0500 |
commit | 80f6b7736615cc7b09fa2a50f40b9773d0f15c6a (patch) | |
tree | 96aa562db5759583c71a9f3621070c412f1b48db | |
parent | ee0eb25119c2c948b5d30da1a62f6d44020cb636 (diff) |
ALSA: hda/realtek - Drop ALC262 model=nec quirk
This laptop works also fine with the auto-parser and the BIOS setup.
A good boy.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/alc262_quirks.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/sound/pci/hda/alc262_quirks.c b/sound/pci/hda/alc262_quirks.c index ace9d48d7e5e..3dc843e70565 100644 --- a/sound/pci/hda/alc262_quirks.c +++ b/sound/pci/hda/alc262_quirks.c | |||
@@ -14,7 +14,6 @@ enum { | |||
14 | ALC262_BENQ_T31, | 14 | ALC262_BENQ_T31, |
15 | ALC262_ULTRA, | 15 | ALC262_ULTRA, |
16 | ALC262_LENOVO_3000, | 16 | ALC262_LENOVO_3000, |
17 | ALC262_NEC, | ||
18 | ALC262_MODEL_LAST /* last tag */ | 17 | ALC262_MODEL_LAST /* last tag */ |
19 | }; | 18 | }; |
20 | 19 | ||
@@ -283,41 +282,6 @@ static const struct hda_verb alc262_sony_unsol_verbs[] = { | |||
283 | }; | 282 | }; |
284 | 283 | ||
285 | /* | 284 | /* |
286 | * nec model | ||
287 | * 0x15 = headphone | ||
288 | * 0x16 = internal speaker | ||
289 | * 0x18 = external mic | ||
290 | */ | ||
291 | |||
292 | static const struct snd_kcontrol_new alc262_nec_mixer[] = { | ||
293 | HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT), | ||
294 | HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 0, 0x0, HDA_OUTPUT), | ||
295 | |||
296 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
297 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
298 | HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT), | ||
299 | |||
300 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | ||
301 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), | ||
302 | { } /* end */ | ||
303 | }; | ||
304 | |||
305 | static const struct hda_verb alc262_nec_verbs[] = { | ||
306 | /* Unmute Speaker */ | ||
307 | {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
308 | |||
309 | /* Headphone */ | ||
310 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT}, | ||
311 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
312 | |||
313 | /* External mic to headphone */ | ||
314 | {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, | ||
315 | /* External mic to speaker */ | ||
316 | {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, | ||
317 | {} | ||
318 | }; | ||
319 | |||
320 | /* | ||
321 | * fujitsu model | 285 | * fujitsu model |
322 | * 0x14 = headphone/spdif-out, 0x15 = internal speaker, | 286 | * 0x14 = headphone/spdif-out, 0x15 = internal speaker, |
323 | * 0x1b = port replicator headphone out | 287 | * 0x1b = port replicator headphone out |
@@ -576,13 +540,11 @@ static const char * const alc262_models[ALC262_MODEL_LAST] = { | |||
576 | [ALC262_BENQ_T31] = "benq-t31", | 540 | [ALC262_BENQ_T31] = "benq-t31", |
577 | [ALC262_ULTRA] = "ultra", | 541 | [ALC262_ULTRA] = "ultra", |
578 | [ALC262_LENOVO_3000] = "lenovo-3000", | 542 | [ALC262_LENOVO_3000] = "lenovo-3000", |
579 | [ALC262_NEC] = "nec", | ||
580 | [ALC262_AUTO] = "auto", | 543 | [ALC262_AUTO] = "auto", |
581 | }; | 544 | }; |
582 | 545 | ||
583 | static const struct snd_pci_quirk alc262_cfg_tbl[] = { | 546 | static const struct snd_pci_quirk alc262_cfg_tbl[] = { |
584 | SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO), | 547 | SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO), |
585 | SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC), | ||
586 | SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU), | 548 | SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU), |
587 | SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU), | 549 | SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU), |
588 | SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1", | 550 | SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1", |
@@ -704,15 +666,5 @@ static const struct alc_config_preset alc262_presets[] = { | |||
704 | .setup = alc262_lenovo_3000_setup, | 666 | .setup = alc262_lenovo_3000_setup, |
705 | .init_hook = alc_inithook, | 667 | .init_hook = alc_inithook, |
706 | }, | 668 | }, |
707 | [ALC262_NEC] = { | ||
708 | .mixers = { alc262_nec_mixer }, | ||
709 | .init_verbs = { alc262_nec_verbs }, | ||
710 | .num_dacs = ARRAY_SIZE(alc262_dac_nids), | ||
711 | .dac_nids = alc262_dac_nids, | ||
712 | .hp_nid = 0x03, | ||
713 | .num_channel_mode = ARRAY_SIZE(alc262_modes), | ||
714 | .channel_mode = alc262_modes, | ||
715 | .input_mux = &alc262_capture_source, | ||
716 | }, | ||
717 | }; | 669 | }; |
718 | 670 | ||