2 files changed, 20 insertions, 1 deletions

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 1c7334a3054e..d5b6b1171035 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -846,6 +846,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
@@ -859,6 +860,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
@@ -902,6 +905,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
@@ -917,6 +921,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)
 
@@ -940,6 +945,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
@@ -981,9 +987,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
@@ -1065,6 +1072,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
@@ -1078,6 +1086,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
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt
index f738b296440a..bba2dbb79d81 100644
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
@@ -153,6 +153,16 @@ card*/codec#*
         Shows the general codec information and the attribute of each
         widget node.
 
+card*/eld#*
+        Available for HDMI or DisplayPort interfaces.
+        Shows ELD(EDID Like Data) info retrieved from the attached HDMI sink,
+        and describes its audio capabilities and configurations.
+
+        Some ELD fields may be modified by doing `echo name hex_value > eld#*`.
+        Only do this if you are sure the HDMI sink provided value is wrong.
+        And if that makes your HDMI audio work, please report to us so that we
+        can fix it in future kernel releases.
+
 
 Sequencer Information
 ---------------------