ALSA: hda - Add descriptions of missing model values

[linux-2.6-omap-h63xx.git] / Documentation / sound / alsa / ALSA-Configuration.txt

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 6f6d117ac7e22cd2d9fc981f0fc8542d824d1db8..374cfc02b2f93a2805e519f31811dee3b7dfbbe9 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -746,8 +746,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
   Module snd-hda-intel
   --------------------
 
-    Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8),
-               ATI SB450, SB600, RS600,
+    Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8, ICH9, ICH10,
+                       PCH, SCH),
+               ATI SB450, SB600, R600, RS600, RS690, RS780, RV610, RV620,
+                       RV630, RV635, RV670, RV770,
                VIA VT8251/VT8237A,
                SIS966, ULI M5461
 
@@ -807,6 +809,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
        ALC260
          hp            HP machines
          hp-3013       HP machines (3013-variant)
+         hp-dc7600     HP DC7600
          fujitsu       Fujitsu S7020
          acer          Acer TravelMate
          will          Will laptops (PB V7900)
@@ -828,8 +831,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          hippo         Hippo (ATI) with jack detection, Sony UX-90s
          hippo_1       Hippo (Benq) with jack detection
          sony-assamd   Sony ASSAMD
+         toshiba-s06   Toshiba S06
          ultra         Samsung Q1 Ultra Vista model
          lenovo-3000   Lenovo 3000 y410
+         nec           NEC Versa S9100
          basic         fixed pin assignment w/o SPDIF
          auto          auto-config reading BIOS (default)
 
@@ -838,6 +843,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          3stack        3-stack model
          toshiba       Toshiba A205
          acer          Acer laptops
+         acer-aspire   Acer Aspire One
          dell          Dell OEM laptops (Vostro 1200)
          zepto         Zepto laptops
          test          for testing/debugging purpose, almost all controls can
@@ -847,6 +853,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
        ALC269
          basic         Basic preset
+         quanta        Quanta FL1
+         eeepc-p703    ASUS Eeepc P703 P900A
+         eeepc-p901    ASUS Eeepc P901 S101
 
        ALC662/663
          3stack-dig    3-stack (2-channel) with SPDIF
@@ -856,10 +865,17 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          lenovo-101e    Lenovo laptop
          eeepc-p701    ASUS Eeepc P701
          eeepc-ep20    ASUS Eeepc EP20
+         ecs           ECS/Foxconn mobo
          m51va         ASUS M51VA
          g71v          ASUS G71V
          h13           ASUS H13
          g50v          ASUS G50V
+         asus-mode1    ASUS
+         asus-mode2    ASUS
+         asus-mode3    ASUS
+         asus-mode4    ASUS
+         asus-mode5    ASUS
+         asus-mode6    ASUS
          auto          auto-config reading BIOS (default)
 
        ALC882/885
@@ -891,12 +907,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          lenovo-101e   Lenovo 101E
          lenovo-nb0763 Lenovo NB0763
          lenovo-ms7195-dig Lenovo MS7195
+         lenovo-sky    Lenovo Sky
          haier-w66     Haier W66
          3stack-hp     HP machines with 3stack (Lucknow, Samba boards)
          6stack-dell   Dell machines with 6stack (Inspiron 530)
          mitac         Mitac 8252D
          clevo-m720    Clevo M720 laptop series
          fujitsu-pi2515 Fujitsu AMILO Pi2515
+         3stack-6ch-intel Intel DG33* boards
          auto          auto-config reading BIOS (default)
 
        ALC861/660
@@ -929,7 +947,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          allout        5-jack in back, 2-jack in front, SPDIF out
          auto          auto-config reading BIOS (default)
 
-       AD1882
+       AD1882 / AD1882A
          3stack        3-stack mode (default)
          6stack        6-stack mode
 
@@ -1144,8 +1162,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports autoprobe and multiple cards.
 
-    Power management is _not_ supported.
-
   Module snd-ice1712
   ------------------
 
@@ -1168,6 +1184,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                        * Event Electronics, EZ8
                         * Digigram VX442
                        * Lionstracs, Mediastaton
+                       * Terrasoniq TS 88
 
     model       - Use the given board model, one of the following:
                  delta1010, dio2496, delta66, delta44, audiophile, delta410,
@@ -1202,7 +1219,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                        * TerraTec Phase 22
                        * TerraTec Phase 28
                        * AudioTrak Prodigy 7.1
-                       * AudioTrak Prodigy 7.1LT
+                       * AudioTrak Prodigy 7.1 LT
+                       * AudioTrak Prodigy 7.1 XT
+                       * AudioTrak Prodigy 7.1 HIFI
+                       * AudioTrak Prodigy 7.1 HD2
                        * AudioTrak Prodigy 192
                        * Pontis MS300
                        * Albatron K8X800 Pro II 
@@ -1213,12 +1233,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                        * Shuttle SN25P
                        * Onkyo SE-90PCI
                        * Onkyo SE-200PCI
+                       * ESI Juli@
+                       * Hercules Fortissimo IV
+                       * EGO-SYS WaveTerminal 192M
 
     model       - Use the given board model, one of the following:
                  revo51, revo71, amp2000, prodigy71, prodigy71lt,
-                 prodigy192, aureon51, aureon71, universe, ap192,
-                 k8x800, phase22, phase28, ms300, av710, se200pci,
-                 se90pci
+                 prodigy71xt, prodigy71hifi, prodigyhd2, prodigy192,
+                 juli, aureon51, aureon71, universe, ap192, k8x800,
+                 phase22, phase28, ms300, av710, se200pci, se90pci,
+                 fortissimo4, sn25p, WT192M
 
     This module supports multiple cards and autoprobe.
 
@@ -1257,7 +1281,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     Module for AC'97 motherboards from Intel and compatibles.
                        * Intel i810/810E, i815, i820, i830, i84x, MX440
-                               ICH5, ICH6, ICH7, ESB2
+                               ICH5, ICH6, ICH7, 6300ESB, ESB2
                        * SiS 7012 (SiS 735)
                        * NVidia NForce, NForce2, NForce3, MCP04, CK804
                                 CK8, CK8S, MCP501
@@ -1628,8 +1652,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports autoprobe and multiple cards.
 
-    Power management is _not_ supported.
-
   Module snd-pcsp
   -----------------
 
@@ -1955,6 +1977,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                        * CHIC  True Sound 4Dwave
                        * Shark  Predator4D-PCI
                        * Jaton  SonicWave 4D
+                       * SiS SI7018 PCI Audio
+                       * Hoontech SoundTrack Digital 4DWave NX
 
     pcm_channels   - max channels (voices) reserved for PCM
     wavetable_size - max wavetable size in kB (4-?kb)
@@ -1970,12 +1994,25 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     vid             - Vendor ID for the device (optional)
     pid             - Product ID for the device (optional)
+    nrpacks        - Max. number of packets per URB (default: 8)
+    async_unlink    - Use async unlink mode (default: yes)
     device_setup    - Device specific magic number (optional)
                     - Influence depends on the device
                     - Default: 0x0000 
+    ignore_ctl_error - Ignore any USB-controller regarding mixer
+                      interface (default: no)
 
     This module supports multiple devices, autoprobe and hotplugging.
 
+    NB: nrpacks parameter can be modified dynamically via sysfs.
+        Don't put the value over 20.  Changing via sysfs has no sanity
+       check.
+    NB: async_unlink=0 would cause Oops.  It remains just for
+        debugging purpose (if any).
+    NB: ignore_ctl_error=1 may help when you get an error at accessing
+        the mixer element such as URB error -22.  This happens on some
+        buggy USB device or the controller.
+
   Module snd-usb-caiaq
   --------------------
 
@@ -2081,13 +2118,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
   Module snd-virtuoso
   -------------------
 
-    Module for sound cards based on the Asus AV200 chip, i.e.,
-    Xonar D2 and Xonar D2X.
+    Module for sound cards based on the Asus AV100/AV200 chips,
+    i.e., Xonar D1, DX, D2 and D2X.
 
     This module supports autoprobe and multiple cards.
 
-    Power management is _not_ supported.
-
   Module snd-vx222
   ----------------