[ALSA] hda-codec - Add model=hp-tc-t5735 for ALC262

[powerpc.git] / Documentation / sound / alsa / ALSA-Configuration.txt

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 74a8293..f5e77c7 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -57,7 +57,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                - Default: 1
                - For auto-loading more than one card, specify this
                  option together with snd-card-X aliases.
-
+    slots      - Reserve the slot index for the given driver.
+                 This option takes multiple strings.           
+                 See "Module Autoloading Support" section for details.
   
   Module snd-pcm-oss
   ------------------
@@ -770,7 +772,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                codecs (for debugging only)
     enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)
     power_save - Automatic power-saving timtout (in second, 0 =
-               disable, default = 10)
+               disable)
     power_save_controller - Reset HD-audio controller in power-saving mode
                (default = on)
 
@@ -823,11 +825,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          fujitsu       Fujitsu Laptop
          hp-bpc        HP xw4400/6400/8400/9400 laptops
          hp-bpc-d7000  HP BPC D7000
+         hp-tc-t5735   HP Thin Client T5735
          benq          Benq ED8
          benq-t31      Benq T31
          hippo         Hippo (ATI) with jack detection, Sony UX-90s
          hippo_1       Hippo (Benq) with jack detection
          sony-assamd   Sony ASSAMD
+         ultra         Samsung Q1 Ultra Vista model
          basic         fixed pin assignment w/o SPDIF
          auto          auto-config reading BIOS (default)
 
@@ -843,6 +847,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          3stack-6ch-dig 3-stack (6-channel) with SPDIF
          6stack-dig     6-stack with SPDIF
          lenovo-101e    Lenovo laptop
+         eeepc-p701    ASUS Eeepc
          auto          auto-config reading BIOS (default)
 
        ALC882/885
@@ -972,6 +977,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          dell-m25      Dell Inspiron E1505n
          dell-m26      Dell Inspiron 1501
          dell-m27      Dell Inspiron E1705/9400
+         gateway       Gateway laptops with EAPD control
 
        STAC9205/9254
          ref           Reference board
@@ -1024,11 +1030,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel
     ML (see the section "Links and Addresses").
 
-    When CONFIG_SND_HDA_POWER_SAVE is set, two options, power_save and
-    power_save_controller become available.  power_save specifies the
-    time to turn off the power automatically at idle status.  When
-    power_save_controller is true, the controller is also turned off.
-    This might result in more obvious click noise at turning on/off.
+    power_save and power_save_controller options are for power-saving
+    mode.  See powersave.txt for details.
 
     Note 2: If you get click noises on output, try the module option
            position_fix=1 or 2.  position_fix=1 will use the SD_LPIB
@@ -1158,11 +1161,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                        * Chaintech 9CJS
                        * Chaintech AV-710
                        * Shuttle SN25P
+                       * Onkyo SE-90PCI
+                       * Onkyo SE-200PCI
 
     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
+                 k8x800, phase22, phase28, ms300, av710, se200pci,
+                 se90pci
 
     This module supports multiple cards and autoprobe.
 
@@ -1390,7 +1396,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     port       - port number or -1 (disable)
     irq                - IRQ number or -1 (disable)
     pnp                - PnP detection - 0 = disable, 1 = enable (default)
-    uart_enter - Issue UART_ENTER command at open - bool, default = on
 
     This module supports multiple devices and PnP.
     
@@ -1679,7 +1684,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     port       - Port # (0x220 or 0x240)
     mss_port   - MSS Port # (0x530 or 0xe80)
     irq                - IRQ # (5,7,9,10,11)
-    mpu_irq    - MPU-401 IRQ # (ditto)
+    mpu_irq    - MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq
     dma                - DMA # (1,3,0)
 
     This module supports multiple cards.
@@ -1706,9 +1711,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     Module for ENSONIQ SoundScape PnP cards.
 
     port       - Port # (PnP setup)
+    wss_port   - WSS Port # (PnP setup)
     irq                - IRQ # (PnP setup)
     mpu_irq    - MPU-401 IRQ # (PnP setup)
     dma                - DMA # (PnP setup)
+    dma2       - 2nd DMA # (PnP setup, -1 to disable)
 
     This module supports multiple cards.  ISA PnP must be enabled.
     You need sscape_ctl tool in alsa-tools package for loading
@@ -2136,6 +2143,23 @@ alias sound-slot-1 snd-ens1371
 In this example, the interwave card is always loaded as the first card
 (index 0) and ens1371 as the second (index 1).
 
+Alternative (and new) way to fixate the slot assignment is to use
+"slots" option of snd module.  In the case above, specify like the
+following: 
+
+options snd slots=snd-interwave,snd-ens1371
+
+Then, the first slot (#0) is reserved for snd-interwave driver, and
+the second (#1) for snd-ens1371.  You can omit index option in each
+driver if slots option is used (although you can still have them at
+the same time as long as they don't conflict).
+
+The slots option is especially useful for avoiding the possible
+hot-plugging and the resultant slot conflict.  For example, in the
+case above again, the first two slots are already reserved.  If any
+other driver (e.g. snd-usb-audio) is loaded before snd-interwave or
+snd-ens1371, it will be assigned to the third or later slot.
+
 
 ALSA PCM devices to OSS devices mapping
 =======================================