aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt5
-rw-r--r--sound/pci/hda/patch_realtek.c10
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
114 samsung-nc10 Samsung NC10 mini notebook 114 samsung-nc10 Samsung NC10 mini notebook
115 auto auto-config reading BIOS (default) 115 auto auto-config reading BIOS (default)
116 116
117ALC680
118======
119 base Base model (ASUS NX90)
120 auto auto-config reading BIOS (default)
121
117ALC882/883/885/888/889 122ALC882/883/885/888/889
118====================== 123======================
119 3stack-dig 3-jack with SPDIF I/O 124 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 {
256 ALC882_MODEL_LAST, 256 ALC882_MODEL_LAST,
257}; 257};
258 258
259/* ALC680 models */
260enum {
261 ALC680_BASE,
262 ALC680_AUTO,
263 ALC680_MODEL_LAST,
264};
265
259/* for GPIO Poll */ 266/* for GPIO Poll */
260#define GPIO_MASK 0x03 267#define GPIO_MASK 0x03
261 268
@@ -18997,7 +19004,8 @@ static void alc680_auto_init(struct hda_codec *codec)
18997 * configuration and preset 19004 * configuration and preset
18998 */ 19005 */
18999static const char *alc680_models[ALC680_MODEL_LAST] = { 19006static const char *alc680_models[ALC680_MODEL_LAST] = {
19000 [ALC680_BASE] = "alc680_base", 19007 [ALC680_BASE] = "base",
19008 [ALC680_AUTO] = "auto",
19001}; 19009};
19002 19010
19003static struct snd_pci_quirk alc680_cfg_tbl[] = { 19011static struct snd_pci_quirk alc680_cfg_tbl[] = {