diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 17:51:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 17:52:39 +0200 |
| commit | d4a86d81944d3cccb3f4a309230e835823a61252 (patch) | |
| tree | 05e16d3117c8a90caef1ea97bd6d08b512be50c7 | |
| parent | d1eb57f47b7f524c13112c891e87fb1f51029fd1 (diff) | |
| download | linux-d4a86d81944d3cccb3f4a309230e835823a61252.tar.gz linux-d4a86d81944d3cccb3f4a309230e835823a61252.tar.xz | |
ALSA: hda - Add missing ALC680_* definitions
Also update the documentation.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 5 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 84e81ad7ba2d..03771d7c5dd7 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -114,6 +114,11 @@ ALC662/663/272 samsung-nc10 Samsung NC10 mini notebook auto auto-config reading BIOS (default) +ALC680 +====== + base Base model (ASUS NX90) + auto auto-config reading BIOS (default) + ALC882/883/885/888/889 ====================== 3stack-dig 3-jack with SPDIF I/O diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 630e66743e8e..9b15a46e3ccc 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -256,6 +256,13 @@ enum { ALC882_MODEL_LAST, }; +/* ALC680 models */ +enum { + ALC680_BASE, + ALC680_AUTO, + ALC680_MODEL_LAST, +}; + /* for GPIO Poll */ #define GPIO_MASK 0x03 @@ -18997,7 +19004,8 @@ static void alc680_auto_init(struct hda_codec *codec) * configuration and preset */ static const char *alc680_models[ALC680_MODEL_LAST] = { - [ALC680_BASE] = "alc680_base", + [ALC680_BASE] = "base", + [ALC680_AUTO] = "auto", }; static struct snd_pci_quirk alc680_cfg_tbl[] = { |