Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-drm-fsl-dcu.git] / Documentation / sound / alsa / ALSA-Configuration.txt

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index c54fd7c258d938dc0a58f70fe9d49540d12f1c21..73e9a174b6427853b073bf4143e88e9f6e014a0f 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -242,6 +242,12 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     ac97_clock         - AC'97 clock (default = 48000)
     ac97_quirk         - AC'97 workaround for strange hardware
                          See "AC97 Quirk Option" section below.
+    ac97_codec         - Workaround to specify which AC'97 codec 
+                         instead of probing.  If this works for you
+                         file a bug with your `lspci -vn` output.
+                         -2  -- Force probing.
+                         -1  -- Default behavior.
+                         0-2 -- Use the specified codec.
     spdif_aclink       - S/PDIF transfer over AC-link (default = 1)
 
     This module supports one card and autoprobe.
@@ -364,7 +370,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     mpu_port   - 0x300,0x310,0x320,0x330 = legacy port,
                  1 = integrated PCI port,
                  0 = disable (default)
-    fm_port     - 0x388 (default), 0 = disable (default)
+    fm_port     - 0x388 = legacy port,
+                 1 = integrated PCI port (default),
+                 0 = disable
     soft_ac3    - Software-conversion of raw SPDIF packets (model 033 only)
                   (default = 1)
     joystick_port - Joystick port address (0 = disable, 1 = auto-detect)
@@ -779,6 +787,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          asus-dig      ASUS with SPDIF out
          asus-dig2     ASUS with SPDIF out (using GPIO2)
          uniwill       3-jack
+         fujitsu       Fujitsu Laptops (Pi1536)
          F1734         2-jack
          lg            LG laptop (m1 express dual)
          lg-lw         LG LW20/LW25 laptop
@@ -800,6 +809,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
        ALC262
          fujitsu       Fujitsu Laptop
          hp-bpc        HP xw4400/6400/8400/9400 laptops
+         hp-bpc-d7000  HP BPC D7000
          benq          Benq ED8
          hippo         Hippo (ATI) with jack detection, Sony UX-90s
          hippo_1       Hippo (Benq) with jack detection
@@ -808,8 +818,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
        ALC882/885
          3stack-dig    3-jack with SPDIF I/O
-         6stck-dig     6-jack digital with SPDIF I/O
+         6stack-dig    6-jack digital with SPDIF I/O
          arima         Arima W820Di1
+         macpro        MacPro support
          auto          auto-config reading BIOS (default)
 
        ALC883/888
@@ -833,6 +844,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          uniwill-m31   Uniwill M31 laptop
          toshiba       Toshiba laptop support
          asus          Asus laptop support
+         asus-laptop   ASUS F2/F3 laptops
+         auto          auto-config reading BIOS (default)
+
+       ALC861VD/660VD
+         3stack        3-jack
+         3stack-dig    3-jack with SPDIF OUT
+         6stack-dig    6-jack with SPDIF OUT
+         3stack-660    3-jack (for ALC660VD)
          auto          auto-config reading BIOS (default)
 
        CMI9880
@@ -847,12 +866,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          basic         3-jack (default)
          hp            HP nx6320
          thinkpad      Lenovo Thinkpad T60/X60/Z60
+         toshiba       Toshiba U205
 
        AD1986A
          6stack        6-jack, separate surrounds (default)
          3stack        3-stack, shared surrounds
          laptop        2-channel only (FSC V2060, Samsung M50)
          laptop-eapd   2-channel with EAPD (Samsung R65, ASUS A6J)
+         ultra         2-channel with EAPD (Samsung Ultra tablet PC)
 
        AD1988
          6stack        6-jack
@@ -877,10 +898,22 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                        can be adjusted.  Appearing only when compiled with
                        $CONFIG_SND_DEBUG=y
 
-       STAC9200/9205/9220/9221/9254
+       STAC9200/9205/9254
+         ref           Reference board
+
+       STAC9220/9221
          ref           Reference board
          3stack        D945 3stack
          5stack        D945 5stack + SPDIF
+         macmini       Intel Mac Mini
+         macbook       Intel Mac Book
+         macbook-pro-v1 Intel Mac Book Pro 1st generation
+         macbook-pro   Intel Mac Book Pro 2nd generation
+
+       STAC9202/9250/9251
+         ref           Reference board, base config
+         m2-2          Some Gateway MX series laptops
+         m6            Some Gateway NX series laptops
 
        STAC9227/9228/9229/927x
          ref           Reference board
@@ -1072,6 +1105,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     buggy_semaphore - Enable workaround for hardwares with buggy
                    semaphores (e.g. on some ASUS laptops)
                    (default off)
+    spdif_aclink  - Use S/PDIF over AC-link instead of direct connection
+                   from the controller chip
+                   (0 = off, 1 = on, -1 = default)
 
     This module supports one chip and autoprobe.
 
@@ -1394,6 +1430,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports multiple cards.
 
+  Module snd-portman2x4
+  ---------------------
+
+    Module for Midiman Portman 2x4 parallel port MIDI interface
+
+    This module supports multiple cards.
+
   Module snd-powermac (on ppc only)
   ---------------------------------