Skip to content

L
linux
Commit 188cd2b5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: hda - Remove ALC662 model=levono-101e model quirk 

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 965f1b2e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 51 deletions
Documentation/sound/alsa/HD-Audio-Models.txt
View file @ 188cd2b5
...@@ -73,7 +73,6 @@ ALC662/663/272 ...@@ -73,7 +73,6 @@ ALC662/663/272
3stack-6ch 3-stack (6-channel) 3stack-6ch 3-stack (6-channel)
3stack-6ch-dig 3-stack (6-channel) with SPDIF 3stack-6ch-dig 3-stack (6-channel) with SPDIF
5stack-dig 5-stack with SPDIF 5stack-dig 5-stack with SPDIF
lenovo-101e Lenovo laptop
eeepc-ep20 ASUS Eeepc EP20 eeepc-ep20 ASUS Eeepc EP20
m51va ASUS M51VA m51va ASUS M51VA
g71v ASUS G71V g71v ASUS G71V
......
sound/pci/hda/alc662_quirks.c
View file @ 188cd2b5
...@@ -10,7 +10,6 @@ enum { ...@@ -10,7 +10,6 @@ enum {
ALC662_3ST_6ch_DIG, ALC662_3ST_6ch_DIG,
ALC662_3ST_6ch, ALC662_3ST_6ch,
ALC662_5ST_DIG, ALC662_5ST_DIG,
ALC662_LENOVO_101E,
ALC662_ASUS_EEEPC_EP20, ALC662_ASUS_EEEPC_EP20,
ALC663_ASUS_M51VA, ALC663_ASUS_M51VA,
ALC663_ASUS_G71V, ALC663_ASUS_G71V,
...@@ -207,19 +206,6 @@ static const struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = { ...@@ -207,19 +206,6 @@ static const struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = {
{ } /* end */ { } /* end */
}; };
static const struct snd_kcontrol_new alc662_lenovo_101e_mixer[] = {
HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
HDA_BIND_MUTE("Front Playback Switch", 0x02, 2, HDA_INPUT),
HDA_CODEC_VOLUME("Speaker Playback Volume", 0x03, 0x0, HDA_OUTPUT),
HDA_BIND_MUTE("Speaker Playback Switch", 0x03, 2, HDA_INPUT),
HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
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, 0x1, HDA_INPUT),
HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
{ } /* end */
};
static const struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = { static const struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = {
ALC262_HIPPO_MASTER_SWITCH, ALC262_HIPPO_MASTER_SWITCH,
HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
...@@ -492,12 +478,6 @@ static const struct hda_verb alc662_eapd_init_verbs[] = { ...@@ -492,12 +478,6 @@ static const struct hda_verb alc662_eapd_init_verbs[] = {
{ } { }
}; };
static const struct hda_verb alc662_sue_init_verbs[] = {
{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC_FRONT_EVENT},
{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC_HP_EVENT},
{}
};
/* Set Unsolicited Event*/ /* Set Unsolicited Event*/
static const struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = { static const struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = {
{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
...@@ -668,19 +648,6 @@ static const struct snd_kcontrol_new alc272_auto_capture_mixer[] = { ...@@ -668,19 +648,6 @@ static const struct snd_kcontrol_new alc272_auto_capture_mixer[] = {
{ } /* end */ { } /* end */
}; };
static void alc662_lenovo_101e_setup(struct hda_codec *codec)
{
struct alc_spec *spec = codec->spec;
spec->autocfg.hp_pins[0] = 0x1b;
spec->autocfg.line_out_pins[0] = 0x14;
spec->autocfg.speaker_pins[0] = 0x15;
spec->automute = 1;
spec->detect_line = 1;
spec->automute_lines = 1;
spec->automute_mode = ALC_AUTOMUTE_AMP;
}
static void alc662_eeepc_ep20_setup(struct hda_codec *codec) static void alc662_eeepc_ep20_setup(struct hda_codec *codec)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
...@@ -861,7 +828,6 @@ static const char * const alc662_models[ALC662_MODEL_LAST] = { ...@@ -861,7 +828,6 @@ static const char * const alc662_models[ALC662_MODEL_LAST] = {
[ALC662_3ST_6ch_DIG] = "3stack-6ch-dig", [ALC662_3ST_6ch_DIG] = "3stack-6ch-dig",
[ALC662_3ST_6ch] = "3stack-6ch", [ALC662_3ST_6ch] = "3stack-6ch",
[ALC662_5ST_DIG] = "5stack-dig", [ALC662_5ST_DIG] = "5stack-dig",
[ALC662_LENOVO_101E] = "lenovo-101e",
[ALC662_ASUS_EEEPC_EP20] = "eeepc-ep20", [ALC662_ASUS_EEEPC_EP20] = "eeepc-ep20",
[ALC663_ASUS_M51VA] = "m51va", [ALC663_ASUS_M51VA] = "m51va",
[ALC663_ASUS_G71V] = "g71v", [ALC663_ASUS_G71V] = "g71v",
...@@ -945,12 +911,10 @@ static const struct snd_pci_quirk alc662_cfg_tbl[] = { ...@@ -945,12 +911,10 @@ static const struct snd_pci_quirk alc662_cfg_tbl[] = {
SND_PCI_QUIRK(0x152d, 0x2304, "Quanta WH1", ALC663_ASUS_H13), SND_PCI_QUIRK(0x152d, 0x2304, "Quanta WH1", ALC663_ASUS_H13),
SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG), SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA), SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA),
SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E),
SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0", SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",
ALC662_3ST_6ch_DIG), ALC662_3ST_6ch_DIG),
SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x", SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",
ALC663_ASUS_H13), ALC663_ASUS_H13),
SND_PCI_QUIRK(0x1991, 0x5628, "Ordissimo EVE", ALC662_LENOVO_101E),
{} {}
}; };
...@@ -999,20 +963,6 @@ static const struct alc_config_preset alc662_presets[] = { ...@@ -999,20 +963,6 @@ static const struct alc_config_preset alc662_presets[] = {
.channel_mode = alc662_5stack_modes, .channel_mode = alc662_5stack_modes,
.input_mux = &alc662_capture_source, .input_mux = &alc662_capture_source,
}, },
[ALC662_LENOVO_101E] = {
.mixers = { alc662_lenovo_101e_mixer },
.init_verbs = { alc662_init_verbs,
alc662_eapd_init_verbs,
alc662_sue_init_verbs },
.num_dacs = ARRAY_SIZE(alc662_dac_nids),
.dac_nids = alc662_dac_nids,
.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
.channel_mode = alc662_3ST_2ch_modes,
.input_mux = &alc662_lenovo_101e_capture_source,
.unsol_event = alc_sku_unsol_event,
.setup = alc662_lenovo_101e_setup,
.init_hook = alc_inithook,
},
[ALC662_ASUS_EEEPC_EP20] = { [ALC662_ASUS_EEEPC_EP20] = {
.mixers = { alc662_eeepc_ep20_mixer, .mixers = { alc662_eeepc_ep20_mixer,
alc662_chmode_mixer }, alc662_chmode_mixer },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7