|
@@ -14,7 +14,6 @@ enum {
|
|
|
ALC262_BENQ_T31,
|
|
|
ALC262_ULTRA,
|
|
|
ALC262_LENOVO_3000,
|
|
|
- ALC262_NEC,
|
|
|
ALC262_MODEL_LAST /* last tag */
|
|
|
};
|
|
|
|
|
@@ -282,41 +281,6 @@ static const struct hda_verb alc262_sony_unsol_verbs[] = {
|
|
|
{}
|
|
|
};
|
|
|
|
|
|
-/*
|
|
|
- * nec model
|
|
|
- * 0x15 = headphone
|
|
|
- * 0x16 = internal speaker
|
|
|
- * 0x18 = external mic
|
|
|
- */
|
|
|
-
|
|
|
-static const struct snd_kcontrol_new alc262_nec_mixer[] = {
|
|
|
- HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
|
|
|
- HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 0, 0x0, HDA_OUTPUT),
|
|
|
-
|
|
|
- HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
|
|
- HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
|
|
- HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
|
|
|
-
|
|
|
- HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
|
|
|
- HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
|
|
|
- { } /* end */
|
|
|
-};
|
|
|
-
|
|
|
-static const struct hda_verb alc262_nec_verbs[] = {
|
|
|
- /* Unmute Speaker */
|
|
|
- {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
|
|
-
|
|
|
- /* Headphone */
|
|
|
- {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
|
|
|
- {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
|
|
-
|
|
|
- /* External mic to headphone */
|
|
|
- {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
|
|
- /* External mic to speaker */
|
|
|
- {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
|
|
- {}
|
|
|
-};
|
|
|
-
|
|
|
/*
|
|
|
* fujitsu model
|
|
|
* 0x14 = headphone/spdif-out, 0x15 = internal speaker,
|
|
@@ -576,13 +540,11 @@ static const char * const alc262_models[ALC262_MODEL_LAST] = {
|
|
|
[ALC262_BENQ_T31] = "benq-t31",
|
|
|
[ALC262_ULTRA] = "ultra",
|
|
|
[ALC262_LENOVO_3000] = "lenovo-3000",
|
|
|
- [ALC262_NEC] = "nec",
|
|
|
[ALC262_AUTO] = "auto",
|
|
|
};
|
|
|
|
|
|
static const struct snd_pci_quirk alc262_cfg_tbl[] = {
|
|
|
SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
|
|
|
- SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC),
|
|
|
SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),
|
|
|
SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
|
|
|
SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",
|
|
@@ -704,15 +666,5 @@ static const struct alc_config_preset alc262_presets[] = {
|
|
|
.setup = alc262_lenovo_3000_setup,
|
|
|
.init_hook = alc_inithook,
|
|
|
},
|
|
|
- [ALC262_NEC] = {
|
|
|
- .mixers = { alc262_nec_mixer },
|
|
|
- .init_verbs = { alc262_nec_verbs },
|
|
|
- .num_dacs = ARRAY_SIZE(alc262_dac_nids),
|
|
|
- .dac_nids = alc262_dac_nids,
|
|
|
- .hp_nid = 0x03,
|
|
|
- .num_channel_mode = ARRAY_SIZE(alc262_modes),
|
|
|
- .channel_mode = alc262_modes,
|
|
|
- .input_mux = &alc262_capture_source,
|
|
|
- },
|
|
|
};
|
|
|
|