diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-11-07 09:04:23 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-11-08 02:59:35 -0500 |
commit | 6fb9c82c47164ac5daa80e9f7979ccfa252ed2b5 (patch) | |
tree | a29d085144fb8cbd1b27c5d176a3dd223d743f19 /sound | |
parent | 3dcd3be33046c9828a6057ee0f14de6e5d3b48a2 (diff) |
ALSA: hda/realtek - Drop ALC262 model=hippo static quirks
This model (actually BenQ Joybook) works fine with the default auto-parser
and the BIOS setup. Just drop the static quirks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/alc262_quirks.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/sound/pci/hda/alc262_quirks.c b/sound/pci/hda/alc262_quirks.c index ae10d008abcb..38ff995b46a5 100644 --- a/sound/pci/hda/alc262_quirks.c +++ b/sound/pci/hda/alc262_quirks.c | |||
@@ -8,7 +8,6 @@ enum { | |||
8 | ALC262_AUTO, | 8 | ALC262_AUTO, |
9 | ALC262_BASIC, | 9 | ALC262_BASIC, |
10 | ALC262_HIPPO, | 10 | ALC262_HIPPO, |
11 | ALC262_HIPPO_1, | ||
12 | ALC262_ULTRA, | 11 | ALC262_ULTRA, |
13 | ALC262_MODEL_LAST /* last tag */ | 12 | ALC262_MODEL_LAST /* last tag */ |
14 | }; | 13 | }; |
@@ -112,22 +111,6 @@ static const struct snd_kcontrol_new alc262_hippo_mixer[] = { | |||
112 | { } /* end */ | 111 | { } /* end */ |
113 | }; | 112 | }; |
114 | 113 | ||
115 | static const struct snd_kcontrol_new alc262_hippo1_mixer[] = { | ||
116 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
117 | ALC262_HIPPO_MASTER_SWITCH, | ||
118 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
119 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
120 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
121 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
122 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
123 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
124 | HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT), | ||
125 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), | ||
126 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT), | ||
127 | HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT), | ||
128 | { } /* end */ | ||
129 | }; | ||
130 | |||
131 | /* mute/unmute internal speaker according to the hp jack and mute state */ | 114 | /* mute/unmute internal speaker according to the hp jack and mute state */ |
132 | static void alc262_hippo_setup(struct hda_codec *codec) | 115 | static void alc262_hippo_setup(struct hda_codec *codec) |
133 | { | 116 | { |
@@ -138,16 +121,6 @@ static void alc262_hippo_setup(struct hda_codec *codec) | |||
138 | alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP); | 121 | alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP); |
139 | } | 122 | } |
140 | 123 | ||
141 | static void alc262_hippo1_setup(struct hda_codec *codec) | ||
142 | { | ||
143 | struct alc_spec *spec = codec->spec; | ||
144 | |||
145 | spec->autocfg.hp_pins[0] = 0x1b; | ||
146 | spec->autocfg.speaker_pins[0] = 0x14; | ||
147 | alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP); | ||
148 | } | ||
149 | |||
150 | |||
151 | static const struct snd_kcontrol_new alc262_sony_mixer[] = { | 124 | static const struct snd_kcontrol_new alc262_sony_mixer[] = { |
152 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 125 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
153 | ALC262_HIPPO_MASTER_SWITCH, | 126 | ALC262_HIPPO_MASTER_SWITCH, |
@@ -246,26 +219,6 @@ static const struct hda_verb alc262_eapd_verbs[] = { | |||
246 | { } | 219 | { } |
247 | }; | 220 | }; |
248 | 221 | ||
249 | static const struct hda_verb alc262_hippo1_unsol_verbs[] = { | ||
250 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0}, | ||
251 | {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
252 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000}, | ||
253 | |||
254 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT}, | ||
255 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
256 | {} | ||
257 | }; | ||
258 | |||
259 | static const struct hda_verb alc262_sony_unsol_verbs[] = { | ||
260 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0}, | ||
261 | {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
262 | {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24}, // Front Mic | ||
263 | |||
264 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT}, | ||
265 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
266 | {} | ||
267 | }; | ||
268 | |||
269 | /* Samsung Q1 Ultra Vista model setup */ | 222 | /* Samsung Q1 Ultra Vista model setup */ |
270 | static const struct snd_kcontrol_new alc262_ultra_mixer[] = { | 223 | static const struct snd_kcontrol_new alc262_ultra_mixer[] = { |
271 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 224 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
@@ -390,7 +343,6 @@ static const struct snd_kcontrol_new alc262_ultra_capture_mixer[] = { | |||
390 | static const char * const alc262_models[ALC262_MODEL_LAST] = { | 343 | static const char * const alc262_models[ALC262_MODEL_LAST] = { |
391 | [ALC262_BASIC] = "basic", | 344 | [ALC262_BASIC] = "basic", |
392 | [ALC262_HIPPO] = "hippo", | 345 | [ALC262_HIPPO] = "hippo", |
393 | [ALC262_HIPPO_1] = "hippo_1", | ||
394 | [ALC262_ULTRA] = "ultra", | 346 | [ALC262_ULTRA] = "ultra", |
395 | [ALC262_AUTO] = "auto", | 347 | [ALC262_AUTO] = "auto", |
396 | }; | 348 | }; |
@@ -400,7 +352,6 @@ static const struct snd_pci_quirk alc262_cfg_tbl[] = { | |||
400 | SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1", | 352 | SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1", |
401 | ALC262_ULTRA), | 353 | ALC262_ULTRA), |
402 | SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO), | 354 | SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO), |
403 | SND_PCI_QUIRK(0x17ff, 0x058f, "Benq Hippo", ALC262_HIPPO_1), | ||
404 | {} | 355 | {} |
405 | }; | 356 | }; |
406 | 357 | ||
@@ -429,20 +380,6 @@ static const struct alc_config_preset alc262_presets[] = { | |||
429 | .setup = alc262_hippo_setup, | 380 | .setup = alc262_hippo_setup, |
430 | .init_hook = alc_inithook, | 381 | .init_hook = alc_inithook, |
431 | }, | 382 | }, |
432 | [ALC262_HIPPO_1] = { | ||
433 | .mixers = { alc262_hippo1_mixer }, | ||
434 | .init_verbs = { alc262_init_verbs, alc262_hippo1_unsol_verbs}, | ||
435 | .num_dacs = ARRAY_SIZE(alc262_dac_nids), | ||
436 | .dac_nids = alc262_dac_nids, | ||
437 | .hp_nid = 0x02, | ||
438 | .dig_out_nid = ALC262_DIGOUT_NID, | ||
439 | .num_channel_mode = ARRAY_SIZE(alc262_modes), | ||
440 | .channel_mode = alc262_modes, | ||
441 | .input_mux = &alc262_capture_source, | ||
442 | .unsol_event = alc_sku_unsol_event, | ||
443 | .setup = alc262_hippo1_setup, | ||
444 | .init_hook = alc_inithook, | ||
445 | }, | ||
446 | [ALC262_ULTRA] = { | 383 | [ALC262_ULTRA] = { |
447 | .mixers = { alc262_ultra_mixer }, | 384 | .mixers = { alc262_ultra_mixer }, |
448 | .cap_mixer = alc262_ultra_capture_mixer, | 385 | .cap_mixer = alc262_ultra_capture_mixer, |