diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-26 10:50:43 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-26 10:50:43 -0500 |
commit | 1607b8ea0a4cc20752978fadb027daafc8a2d93c (patch) | |
tree | fba95a76044c5e1090a8195e2a046d05f1cf9fc8 | |
parent | 23f0c048ba59ad5c2f3fd85ed98360b631dbf6f8 (diff) |
ALSA: hda - Add model=auto for STAC/IDT codecs
Added the model=auto to STAC/IDT codecs to use the BIOS default setup
explicitly. It can be used to disable the device-specific model quirk
in the driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 8 | ||||
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 0e52d273ce96..a448bbefd488 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -280,6 +280,7 @@ STAC9200 | |||
280 | gateway-m4 Gateway laptops with EAPD control | 280 | gateway-m4 Gateway laptops with EAPD control |
281 | gateway-m4-2 Gateway laptops with EAPD control | 281 | gateway-m4-2 Gateway laptops with EAPD control |
282 | panasonic Panasonic CF-74 | 282 | panasonic Panasonic CF-74 |
283 | auto BIOS setup (default) | ||
283 | 284 | ||
284 | STAC9205/9254 | 285 | STAC9205/9254 |
285 | ============= | 286 | ============= |
@@ -288,6 +289,7 @@ STAC9205/9254 | |||
288 | dell-m43 Dell Precision | 289 | dell-m43 Dell Precision |
289 | dell-m44 Dell Inspiron | 290 | dell-m44 Dell Inspiron |
290 | eapd Keep EAPD on (e.g. Gateway T1616) | 291 | eapd Keep EAPD on (e.g. Gateway T1616) |
292 | auto BIOS setup (default) | ||
291 | 293 | ||
292 | STAC9220/9221 | 294 | STAC9220/9221 |
293 | ============= | 295 | ============= |
@@ -311,6 +313,7 @@ STAC9220/9221 | |||
311 | dell-d82 Dell (unknown) | 313 | dell-d82 Dell (unknown) |
312 | dell-m81 Dell (unknown) | 314 | dell-m81 Dell (unknown) |
313 | dell-m82 Dell XPS M1210 | 315 | dell-m82 Dell XPS M1210 |
316 | auto BIOS setup (default) | ||
314 | 317 | ||
315 | STAC9202/9250/9251 | 318 | STAC9202/9250/9251 |
316 | ================== | 319 | ================== |
@@ -322,6 +325,7 @@ STAC9202/9250/9251 | |||
322 | m3 Some Gateway MX series laptops | 325 | m3 Some Gateway MX series laptops |
323 | m5 Some Gateway MX series laptops (MP6954) | 326 | m5 Some Gateway MX series laptops (MP6954) |
324 | m6 Some Gateway NX series laptops | 327 | m6 Some Gateway NX series laptops |
328 | auto BIOS setup (default) | ||
325 | 329 | ||
326 | STAC9227/9228/9229/927x | 330 | STAC9227/9228/9229/927x |
327 | ======================= | 331 | ======================= |
@@ -331,6 +335,7 @@ STAC9227/9228/9229/927x | |||
331 | 5stack D965 5stack + SPDIF | 335 | 5stack D965 5stack + SPDIF |
332 | dell-3stack Dell Dimension E520 | 336 | dell-3stack Dell Dimension E520 |
333 | dell-bios Fixes with Dell BIOS setup | 337 | dell-bios Fixes with Dell BIOS setup |
338 | auto BIOS setup (default) | ||
334 | 339 | ||
335 | STAC92HD71B* | 340 | STAC92HD71B* |
336 | ============ | 341 | ============ |
@@ -339,6 +344,7 @@ STAC92HD71B* | |||
339 | dell-m4-2 Dell desktops | 344 | dell-m4-2 Dell desktops |
340 | dell-m4-3 Dell desktops | 345 | dell-m4-3 Dell desktops |
341 | hp-m4 HP dv laptops | 346 | hp-m4 HP dv laptops |
347 | auto BIOS setup (default) | ||
342 | 348 | ||
343 | STAC92HD73* | 349 | STAC92HD73* |
344 | =========== | 350 | =========== |
@@ -348,11 +354,13 @@ STAC92HD73* | |||
348 | dell-m6-dmic Dell desktops/laptops with digital mics | 354 | dell-m6-dmic Dell desktops/laptops with digital mics |
349 | dell-m6 Dell desktops/laptops with both type of mics | 355 | dell-m6 Dell desktops/laptops with both type of mics |
350 | dell-eq Dell desktops/laptops | 356 | dell-eq Dell desktops/laptops |
357 | auto BIOS setup (default) | ||
351 | 358 | ||
352 | STAC92HD83* | 359 | STAC92HD83* |
353 | =========== | 360 | =========== |
354 | ref Reference board | 361 | ref Reference board |
355 | mic-ref Reference board with power managment for ports | 362 | mic-ref Reference board with power managment for ports |
363 | auto BIOS setup (default) | ||
356 | 364 | ||
357 | STAC9872 | 365 | STAC9872 |
358 | ======== | 366 | ======== |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index da48d8c0b295..37ffd96a9ff2 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -43,6 +43,7 @@ enum { | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | enum { | 45 | enum { |
46 | STAC_AUTO, | ||
46 | STAC_REF, | 47 | STAC_REF, |
47 | STAC_9200_OQO, | 48 | STAC_9200_OQO, |
48 | STAC_9200_DELL_D21, | 49 | STAC_9200_DELL_D21, |
@@ -62,6 +63,7 @@ enum { | |||
62 | }; | 63 | }; |
63 | 64 | ||
64 | enum { | 65 | enum { |
66 | STAC_9205_AUTO, | ||
65 | STAC_9205_REF, | 67 | STAC_9205_REF, |
66 | STAC_9205_DELL_M42, | 68 | STAC_9205_DELL_M42, |
67 | STAC_9205_DELL_M43, | 69 | STAC_9205_DELL_M43, |
@@ -71,6 +73,7 @@ enum { | |||
71 | }; | 73 | }; |
72 | 74 | ||
73 | enum { | 75 | enum { |
76 | STAC_92HD73XX_AUTO, | ||
74 | STAC_92HD73XX_NO_JD, /* no jack-detection */ | 77 | STAC_92HD73XX_NO_JD, /* no jack-detection */ |
75 | STAC_92HD73XX_REF, | 78 | STAC_92HD73XX_REF, |
76 | STAC_DELL_M6_AMIC, | 79 | STAC_DELL_M6_AMIC, |
@@ -81,6 +84,7 @@ enum { | |||
81 | }; | 84 | }; |
82 | 85 | ||
83 | enum { | 86 | enum { |
87 | STAC_92HD83XXX_AUTO, | ||
84 | STAC_92HD83XXX_REF, | 88 | STAC_92HD83XXX_REF, |
85 | STAC_92HD83XXX_PWR_REF, | 89 | STAC_92HD83XXX_PWR_REF, |
86 | STAC_DELL_S14, | 90 | STAC_DELL_S14, |
@@ -88,6 +92,7 @@ enum { | |||
88 | }; | 92 | }; |
89 | 93 | ||
90 | enum { | 94 | enum { |
95 | STAC_92HD71BXX_AUTO, | ||
91 | STAC_92HD71BXX_REF, | 96 | STAC_92HD71BXX_REF, |
92 | STAC_DELL_M4_1, | 97 | STAC_DELL_M4_1, |
93 | STAC_DELL_M4_2, | 98 | STAC_DELL_M4_2, |
@@ -98,6 +103,7 @@ enum { | |||
98 | }; | 103 | }; |
99 | 104 | ||
100 | enum { | 105 | enum { |
106 | STAC_925x_AUTO, | ||
101 | STAC_925x_REF, | 107 | STAC_925x_REF, |
102 | STAC_M1, | 108 | STAC_M1, |
103 | STAC_M1_2, | 109 | STAC_M1_2, |
@@ -110,6 +116,7 @@ enum { | |||
110 | }; | 116 | }; |
111 | 117 | ||
112 | enum { | 118 | enum { |
119 | STAC_922X_AUTO, | ||
113 | STAC_D945_REF, | 120 | STAC_D945_REF, |
114 | STAC_D945GTP3, | 121 | STAC_D945GTP3, |
115 | STAC_D945GTP5, | 122 | STAC_D945GTP5, |
@@ -137,6 +144,7 @@ enum { | |||
137 | }; | 144 | }; |
138 | 145 | ||
139 | enum { | 146 | enum { |
147 | STAC_927X_AUTO, | ||
140 | STAC_D965_REF_NO_JD, /* no jack-detection */ | 148 | STAC_D965_REF_NO_JD, /* no jack-detection */ |
141 | STAC_D965_REF, | 149 | STAC_D965_REF, |
142 | STAC_D965_3ST, | 150 | STAC_D965_3ST, |
@@ -1488,6 +1496,7 @@ static unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = { | |||
1488 | }; | 1496 | }; |
1489 | 1497 | ||
1490 | static const char *stac9200_models[STAC_9200_MODELS] = { | 1498 | static const char *stac9200_models[STAC_9200_MODELS] = { |
1499 | [STAC_AUTO] = "auto", | ||
1491 | [STAC_REF] = "ref", | 1500 | [STAC_REF] = "ref", |
1492 | [STAC_9200_OQO] = "oqo", | 1501 | [STAC_9200_OQO] = "oqo", |
1493 | [STAC_9200_DELL_D21] = "dell-d21", | 1502 | [STAC_9200_DELL_D21] = "dell-d21", |
@@ -1633,6 +1642,7 @@ static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = { | |||
1633 | }; | 1642 | }; |
1634 | 1643 | ||
1635 | static const char *stac925x_models[STAC_925x_MODELS] = { | 1644 | static const char *stac925x_models[STAC_925x_MODELS] = { |
1645 | [STAC_925x_AUTO] = "auto", | ||
1636 | [STAC_REF] = "ref", | 1646 | [STAC_REF] = "ref", |
1637 | [STAC_M1] = "m1", | 1647 | [STAC_M1] = "m1", |
1638 | [STAC_M1_2] = "m1-2", | 1648 | [STAC_M1_2] = "m1-2", |
@@ -1692,6 +1702,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { | |||
1692 | }; | 1702 | }; |
1693 | 1703 | ||
1694 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { | 1704 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { |
1705 | [STAC_92HD73XX_AUTO] = "auto", | ||
1695 | [STAC_92HD73XX_NO_JD] = "no-jd", | 1706 | [STAC_92HD73XX_NO_JD] = "no-jd", |
1696 | [STAC_92HD73XX_REF] = "ref", | 1707 | [STAC_92HD73XX_REF] = "ref", |
1697 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", | 1708 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", |
@@ -1748,6 +1759,7 @@ static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = { | |||
1748 | }; | 1759 | }; |
1749 | 1760 | ||
1750 | static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = { | 1761 | static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = { |
1762 | [STAC_92HD83XXX_AUTO] = "auto", | ||
1751 | [STAC_92HD83XXX_REF] = "ref", | 1763 | [STAC_92HD83XXX_REF] = "ref", |
1752 | [STAC_92HD83XXX_PWR_REF] = "mic-ref", | 1764 | [STAC_92HD83XXX_PWR_REF] = "mic-ref", |
1753 | [STAC_DELL_S14] = "dell-s14", | 1765 | [STAC_DELL_S14] = "dell-s14", |
@@ -1802,6 +1814,7 @@ static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { | |||
1802 | }; | 1814 | }; |
1803 | 1815 | ||
1804 | static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { | 1816 | static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { |
1817 | [STAC_92HD71BXX_AUTO] = "auto", | ||
1805 | [STAC_92HD71BXX_REF] = "ref", | 1818 | [STAC_92HD71BXX_REF] = "ref", |
1806 | [STAC_DELL_M4_1] = "dell-m4-1", | 1819 | [STAC_DELL_M4_1] = "dell-m4-1", |
1807 | [STAC_DELL_M4_2] = "dell-m4-2", | 1820 | [STAC_DELL_M4_2] = "dell-m4-2", |
@@ -1973,6 +1986,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = { | |||
1973 | }; | 1986 | }; |
1974 | 1987 | ||
1975 | static const char *stac922x_models[STAC_922X_MODELS] = { | 1988 | static const char *stac922x_models[STAC_922X_MODELS] = { |
1989 | [STAC_922X_AUTO] = "auto", | ||
1976 | [STAC_D945_REF] = "ref", | 1990 | [STAC_D945_REF] = "ref", |
1977 | [STAC_D945GTP5] = "5stack", | 1991 | [STAC_D945GTP5] = "5stack", |
1978 | [STAC_D945GTP3] = "3stack", | 1992 | [STAC_D945GTP3] = "3stack", |
@@ -2125,6 +2139,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { | |||
2125 | }; | 2139 | }; |
2126 | 2140 | ||
2127 | static const char *stac927x_models[STAC_927X_MODELS] = { | 2141 | static const char *stac927x_models[STAC_927X_MODELS] = { |
2142 | [STAC_927X_AUTO] = "auto", | ||
2128 | [STAC_D965_REF_NO_JD] = "ref-no-jd", | 2143 | [STAC_D965_REF_NO_JD] = "ref-no-jd", |
2129 | [STAC_D965_REF] = "ref", | 2144 | [STAC_D965_REF] = "ref", |
2130 | [STAC_D965_3ST] = "3stack", | 2145 | [STAC_D965_3ST] = "3stack", |
@@ -2222,6 +2237,7 @@ static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = { | |||
2222 | }; | 2237 | }; |
2223 | 2238 | ||
2224 | static const char *stac9205_models[STAC_9205_MODELS] = { | 2239 | static const char *stac9205_models[STAC_9205_MODELS] = { |
2240 | [STAC_9205_AUTO] = "auto", | ||
2225 | [STAC_9205_REF] = "ref", | 2241 | [STAC_9205_REF] = "ref", |
2226 | [STAC_9205_DELL_M42] = "dell-m42", | 2242 | [STAC_9205_DELL_M42] = "dell-m42", |
2227 | [STAC_9205_DELL_M43] = "dell-m43", | 2243 | [STAC_9205_DELL_M43] = "dell-m43", |