Merge branch 'fix/hda' into topic/hda

[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 3cd2ad958176c9e4f4969de00597ea55633d0c2c..2947b79eac8ae7b67dc533dc9c35f5896d88366c 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -844,6 +844,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-dmic     Acer laptops with digital-mic
          acer-aspire   Acer Aspire One
          dell          Dell OEM laptops (Vostro 1200)
          zepto         Zepto laptops
@@ -857,6 +858,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          quanta        Quanta FL1
          eeepc-p703    ASUS Eeepc P703 P900A
          eeepc-p901    ASUS Eeepc P901 S101
+         fujitsu       FSC Amilo
+         auto          auto-config reading BIOS (default)
 
        ALC662/663
          3stack-dig    3-stack (2-channel) with SPDIF
@@ -900,6 +903,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          6stack-dig-demo  6-jack digital for Intel demo board
          acer          Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)
          acer-aspire   Acer Aspire 9810
+         acer-aspire-4930g Acer Aspire 4930G
          medion        Medion Laptops
          medion-md2    Medion MD2
          targa-dig     Targa/MSI
@@ -915,6 +919,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          mitac         Mitac 8252D
          clevo-m720    Clevo M720 laptop series
          fujitsu-pi2515 Fujitsu AMILO Pi2515
+         fujitsu-xa3530 Fujitsu AMILO XA3530
          3stack-6ch-intel Intel DG33* boards
          auto          auto-config reading BIOS (default)
 
@@ -938,6 +943,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          lenovo        Lenovo 3000 C200
          dallas        Dallas laptops
          hp            HP TX1000
+         asus-v1s      ASUS V1Sn
          auto          auto-config reading BIOS (default)
 
        CMI9880
@@ -979,9 +985,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          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)
+         laptop-eapd   2-channel with EAPD (ASUS A6J)
          laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100)
          ultra         2-channel with EAPD (Samsung Ultra tablet PC)
+         samsung       2-channel with EAPD (Samsung R65)
 
        AD1988/AD1988B/AD1989A/AD1989B
          6stack        6-jack
@@ -1063,6 +1070,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
        STAC9227/9228/9229/927x
          ref           Reference board
+         ref-no-jd     Reference board without HP/Mic jack detection
          3stack        D965 3stack
          5stack        D965 5stack + SPDIF
          dell-3stack   Dell Dimension E520
@@ -1076,6 +1084,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
        STAC92HD73*
          ref           Reference board
+         no-jd         BIOS setup but without jack-detection
          dell-m6-amic  Dell desktops/laptops with analog mics
          dell-m6-dmic  Dell desktops/laptops with digital mics
          dell-m6       Dell desktops/laptops with both type of mics