diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-18 09:47:37 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-18 09:48:03 -0400 |
| commit | 91baa2c7170ffaec7d7267923ff025036f4f5c61 (patch) | |
| tree | 2e228cd59168e7119a4c387212604d881c32a23e | |
| parent | 9fbbc94fe0f0a85d048b74fced3cfca404d78a3c (diff) | |
ALSA: hda - Get rid of left-over chunks by previous cleanups
Also update the model description, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 7 | ||||
| -rw-r--r-- | sound/pci/hda/alc861vd_quirks.c | 26 |
2 files changed, 1 insertions, 32 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 12c7ea02e5d3..bb7288858820 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -93,8 +93,7 @@ ALC662/663/272 | |||
| 93 | 93 | ||
| 94 | ALC680 | 94 | ALC680 |
| 95 | ====== | 95 | ====== |
| 96 | base Base model (ASUS NX90) | 96 | N/A |
| 97 | auto auto-config reading BIOS (default) | ||
| 98 | 97 | ||
| 99 | ALC882/883/885/888/889 | 98 | ALC882/883/885/888/889 |
| 100 | ====================== | 99 | ====================== |
| @@ -163,10 +162,6 @@ ALC861VD/660VD | |||
| 163 | 6stack-dig 6-jack with SPDIF OUT | 162 | 6stack-dig 6-jack with SPDIF OUT |
| 164 | 3stack-660 3-jack (for ALC660VD) | 163 | 3stack-660 3-jack (for ALC660VD) |
| 165 | 3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD) | 164 | 3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD) |
| 166 | lenovo Lenovo 3000 C200 | ||
| 167 | dallas Dallas laptops | ||
| 168 | hp HP TX1000 | ||
| 169 | asus-v1s ASUS V1Sn | ||
| 170 | auto auto-config reading BIOS (default) | 165 | auto auto-config reading BIOS (default) |
| 171 | 166 | ||
| 172 | CMI9880 | 167 | CMI9880 |
diff --git a/sound/pci/hda/alc861vd_quirks.c b/sound/pci/hda/alc861vd_quirks.c index 62b22c90ab77..9f652254860a 100644 --- a/sound/pci/hda/alc861vd_quirks.c +++ b/sound/pci/hda/alc861vd_quirks.c | |||
| @@ -159,27 +159,6 @@ static const struct snd_kcontrol_new alc861vd_3st_mixer[] = { | |||
| 159 | { } /* end */ | 159 | { } /* end */ |
| 160 | }; | 160 | }; |
| 161 | 161 | ||
| 162 | static const struct snd_kcontrol_new alc861vd_lenovo_mixer[] = { | ||
| 163 | HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT), | ||
| 164 | /*HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),*/ | ||
| 165 | HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT), | ||
| 166 | |||
| 167 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | ||
| 168 | |||
| 169 | HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT), | ||
| 170 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
| 171 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
| 172 | |||
| 173 | HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT), | ||
| 174 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | ||
| 175 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | ||
| 176 | |||
| 177 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
| 178 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
| 179 | |||
| 180 | { } /* end */ | ||
| 181 | }; | ||
| 182 | |||
| 183 | /* | 162 | /* |
| 184 | * generic initialization of ADC, input mixers and output mixers | 163 | * generic initialization of ADC, input mixers and output mixers |
| 185 | */ | 164 | */ |
| @@ -305,11 +284,6 @@ static const struct hda_verb alc861vd_6stack_init_verbs[] = { | |||
| 305 | { } | 284 | { } |
| 306 | }; | 285 | }; |
| 307 | 286 | ||
| 308 | static const struct hda_verb alc861vd_eapd_verbs[] = { | ||
| 309 | {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2}, | ||
| 310 | { } | ||
| 311 | }; | ||
| 312 | |||
| 313 | /* | 287 | /* |
| 314 | * configuration and preset | 288 | * configuration and preset |
| 315 | */ | 289 | */ |