diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-08-24 12:05:06 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-24 12:05:06 -0400 |
commit | a9b36153a4f75c2977271578df8a82715e803c17 (patch) | |
tree | deddfa119c091ac861d87b75ce2eb79c698524d9 | |
parent | c267468e988bc620a2c167579304157c34c4fe95 (diff) |
ALSA: hda - Remove ALC662 ASUS eeepc-ep20 model quirk
Since the recent fixes, this device works with the auto-parser well.
Let's kill it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 | ||||
-rw-r--r-- | sound/pci/hda/alc662_quirks.c | 49 |
2 files changed, 0 insertions, 50 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 708543699f7e..8bd5034c9a48 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -71,7 +71,6 @@ ALC662/663/272 | |||
71 | 3stack-6ch 3-stack (6-channel) | 71 | 3stack-6ch 3-stack (6-channel) |
72 | 3stack-6ch-dig 3-stack (6-channel) with SPDIF | 72 | 3stack-6ch-dig 3-stack (6-channel) with SPDIF |
73 | 5stack-dig 5-stack with SPDIF | 73 | 5stack-dig 5-stack with SPDIF |
74 | eeepc-ep20 ASUS Eeepc EP20 | ||
75 | asus-mode1 ASUS | 74 | asus-mode1 ASUS |
76 | asus-mode2 ASUS | 75 | asus-mode2 ASUS |
77 | asus-mode3 ASUS | 76 | asus-mode3 ASUS |
diff --git a/sound/pci/hda/alc662_quirks.c b/sound/pci/hda/alc662_quirks.c index ce342b9560ee..628883b46d20 100644 --- a/sound/pci/hda/alc662_quirks.c +++ b/sound/pci/hda/alc662_quirks.c | |||
@@ -10,7 +10,6 @@ enum { | |||
10 | ALC662_3ST_6ch_DIG, | 10 | ALC662_3ST_6ch_DIG, |
11 | ALC662_3ST_6ch, | 11 | ALC662_3ST_6ch, |
12 | ALC662_5ST_DIG, | 12 | ALC662_5ST_DIG, |
13 | ALC662_ASUS_EEEPC_EP20, | ||
14 | ALC662_MODEL_LAST, | 13 | ALC662_MODEL_LAST, |
15 | }; | 14 | }; |
16 | 15 | ||
@@ -194,20 +193,6 @@ static const struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = { | |||
194 | { } /* end */ | 193 | { } /* end */ |
195 | }; | 194 | }; |
196 | 195 | ||
197 | static const struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = { | ||
198 | ALC262_HIPPO_MASTER_SWITCH, | ||
199 | HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT), | ||
200 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT), | ||
201 | HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT), | ||
202 | HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT), | ||
203 | HDA_BIND_MUTE("MuteCtrl Playback Switch", 0x0c, 2, HDA_INPUT), | ||
204 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
205 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
206 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
207 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
208 | { } /* end */ | ||
209 | }; | ||
210 | |||
211 | static const struct snd_kcontrol_new alc662_chmode_mixer[] = { | 196 | static const struct snd_kcontrol_new alc662_chmode_mixer[] = { |
212 | { | 197 | { |
213 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 198 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
@@ -275,23 +260,6 @@ static const struct hda_verb alc662_eapd_init_verbs[] = { | |||
275 | { } | 260 | { } |
276 | }; | 261 | }; |
277 | 262 | ||
278 | /* Set Unsolicited Event*/ | ||
279 | static const struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = { | ||
280 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, | ||
281 | {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT}, | ||
282 | {} | ||
283 | }; | ||
284 | |||
285 | static void alc662_eeepc_ep20_setup(struct hda_codec *codec) | ||
286 | { | ||
287 | struct alc_spec *spec = codec->spec; | ||
288 | |||
289 | spec->autocfg.hp_pins[0] = 0x14; | ||
290 | spec->autocfg.speaker_pins[0] = 0x1b; | ||
291 | spec->automute = 1; | ||
292 | spec->automute_mode = ALC_AUTOMUTE_AMP; | ||
293 | } | ||
294 | |||
295 | /* | 263 | /* |
296 | * configuration and preset | 264 | * configuration and preset |
297 | */ | 265 | */ |
@@ -300,13 +268,11 @@ static const char * const alc662_models[ALC662_MODEL_LAST] = { | |||
300 | [ALC662_3ST_6ch_DIG] = "3stack-6ch-dig", | 268 | [ALC662_3ST_6ch_DIG] = "3stack-6ch-dig", |
301 | [ALC662_3ST_6ch] = "3stack-6ch", | 269 | [ALC662_3ST_6ch] = "3stack-6ch", |
302 | [ALC662_5ST_DIG] = "5stack-dig", | 270 | [ALC662_5ST_DIG] = "5stack-dig", |
303 | [ALC662_ASUS_EEEPC_EP20] = "eeepc-ep20", | ||
304 | [ALC662_AUTO] = "auto", | 271 | [ALC662_AUTO] = "auto", |
305 | }; | 272 | }; |
306 | 273 | ||
307 | static const struct snd_pci_quirk alc662_cfg_tbl[] = { | 274 | static const struct snd_pci_quirk alc662_cfg_tbl[] = { |
308 | SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG), | 275 | SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG), |
309 | SND_PCI_QUIRK(0x1043, 0x82d1, "ASUS Eeepc EP20", ALC662_ASUS_EEEPC_EP20), | ||
310 | SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K", | 276 | SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K", |
311 | ALC662_3ST_6ch_DIG), | 277 | ALC662_3ST_6ch_DIG), |
312 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L", | 278 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L", |
@@ -362,19 +328,4 @@ static const struct alc_config_preset alc662_presets[] = { | |||
362 | .channel_mode = alc662_5stack_modes, | 328 | .channel_mode = alc662_5stack_modes, |
363 | .input_mux = &alc662_capture_source, | 329 | .input_mux = &alc662_capture_source, |
364 | }, | 330 | }, |
365 | [ALC662_ASUS_EEEPC_EP20] = { | ||
366 | .mixers = { alc662_eeepc_ep20_mixer, | ||
367 | alc662_chmode_mixer }, | ||
368 | .init_verbs = { alc662_init_verbs, | ||
369 | alc662_eapd_init_verbs, | ||
370 | alc662_eeepc_ep20_sue_init_verbs }, | ||
371 | .num_dacs = ARRAY_SIZE(alc662_dac_nids), | ||
372 | .dac_nids = alc662_dac_nids, | ||
373 | .num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes), | ||
374 | .channel_mode = alc662_3ST_6ch_modes, | ||
375 | .input_mux = &alc662_lenovo_101e_capture_source, | ||
376 | .unsol_event = alc_sku_unsol_event, | ||
377 | .setup = alc662_eeepc_ep20_setup, | ||
378 | .init_hook = alc_inithook, | ||
379 | }, | ||
380 | }; | 331 | }; |