8 files changed, 154 insertions, 5 deletions

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 2075bbb8b3e2..7f4dcebda9c6 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1285,7 +1285,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     about this driver.  Note that it has been discontinued, but the 
     Voyetra Turtle Beach knowledge base entry for it is still available
     at
-        http://www.turtlebeach.com/site/kb_ftp/790.asp
+        http://www.turtlebeach.com
 
   Module snd-msnd-pinnacle
   ------------------------
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 1d38b0dfba95..03771d7c5dd7 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -114,6 +114,11 @@ ALC662/663/272
   samsung-nc10  Samsung NC10 mini notebook
   auto          auto-config reading BIOS (default)
 
+ALC680
+======
+  base          Base model (ASUS NX90)
+  auto          auto-config reading BIOS (default)
+
 ALC882/883/885/888/889
 ======================
   3stack-dig    3-jack with SPDIF I/O
@@ -282,6 +287,7 @@ Conexant 5051
   hp            HP Spartan laptop
   hp-dv6736     HP dv6736
   hp-f700       HP Compaq Presario F700
+  ideapad       Lenovo IdeaPad laptop
   lenovo-x200   Lenovo X200 laptop
   toshiba       Toshiba Satellite M300
 
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt
index bdafdbd32561..278cc2122ea0 100644
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
@@ -562,7 +562,7 @@ compare the codec registers directly.
 Send a bug report either the followings:
 
 kernel-bugzilla::
-  http://bugme.linux-foundation.org/
+  https://bugzilla.kernel.org/
 alsa-devel ML::
   alsa-devel@alsa-project.org
 
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt
index 07301de12cc4..7fcd1ad96fcc 100644
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
@@ -103,6 +103,8 @@ card*/pcm*/xrun_debug
           bit 2 = Enable additional jiffies check
           bit 3 = Log hwptr update at each period interrupt
           bit 4 = Log hwptr update at each snd_pcm_update_hw_ptr()
+          bit 5 = Show last 10 positions on error
+          bit 6 = Do above only once
 
         When the bit 0 is set, the driver will show the messages to
         kernel log when an xrun is detected.  The debug message is
@@ -122,6 +124,12 @@ card*/pcm*/xrun_debug
         Bits 3 and 4 are for logging the hwptr records.  Note that
         these will give flood of kernel messages.
 
+        When bit 5 is set, the driver logs the last 10 xrun errors and
+        the proc file shows each jiffies, position, period_size,
+        buffer_size, old_hw_ptr, and hw_ptr_base values.
+
+        When bit 6 is set, the full xrun log is shown only once.
+
 card*/pcm*/sub*/info
         The general information of this PCM sub-stream.
 
diff --git a/Documentation/sound/alsa/alsa-parameters.txt b/Documentation/sound/alsa/alsa-parameters.txt
new file mode 100644
index 000000000000..0fa40679b080
--- /dev/null
+++ b/Documentation/sound/alsa/alsa-parameters.txt
@@ -0,0 +1,135 @@
+                          ALSA Kernel Parameters
+                          ~~~~~~~~~~~~~~~~~~~~~~
+
+See Documentation/kernel-parameters.txt for general information on
+specifying module parameters.
+
+This document may not be entirely up to date and comprehensive. The command
+"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
+module. Loadable modules, after being loaded into the running kernel, also
+reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
+parameters may be changed at runtime by the command
+"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
+
+
+        snd-ad1816a=    [HW,ALSA]
+
+        snd-ad1848=     [HW,ALSA]
+
+        snd-ali5451=    [HW,ALSA]
+
+        snd-als100=     [HW,ALSA]
+
+        snd-als4000=    [HW,ALSA]
+
+        snd-azt2320=    [HW,ALSA]
+
+        snd-cmi8330=    [HW,ALSA]
+
+        snd-cmipci=     [HW,ALSA]
+
+        snd-cs4231=     [HW,ALSA]
+
+        snd-cs4232=     [HW,ALSA]
+
+        snd-cs4236=     [HW,ALSA]
+
+        snd-cs4281=     [HW,ALSA]
+
+        snd-cs46xx=     [HW,ALSA]
+
+        snd-dt019x=     [HW,ALSA]
+
+        snd-dummy=      [HW,ALSA]
+
+        snd-emu10k1=    [HW,ALSA]
+
+        snd-ens1370=    [HW,ALSA]
+
+        snd-ens1371=    [HW,ALSA]
+
+        snd-es968=      [HW,ALSA]
+
+        snd-es1688=     [HW,ALSA]
+
+        snd-es18xx=     [HW,ALSA]
+
+        snd-es1938=     [HW,ALSA]
+
+        snd-es1968=     [HW,ALSA]
+
+        snd-fm801=      [HW,ALSA]
+
+        snd-gusclassic= [HW,ALSA]
+
+        snd-gusextreme= [HW,ALSA]
+
+        snd-gusmax=     [HW,ALSA]
+
+        snd-hdsp=       [HW,ALSA]
+
+        snd-ice1712=    [HW,ALSA]
+
+        snd-intel8x0=   [HW,ALSA]
+
+        snd-interwave=  [HW,ALSA]
+
+        snd-interwave-stb=
+                        [HW,ALSA]
+
+        snd-korg1212=   [HW,ALSA]
+
+        snd-maestro3=   [HW,ALSA]
+
+        snd-mpu401=     [HW,ALSA]
+
+        snd-mtpav=      [HW,ALSA]
+
+        snd-nm256=      [HW,ALSA]
+
+        snd-opl3sa2=    [HW,ALSA]
+
+        snd-opti92x-ad1848=
+                        [HW,ALSA]
+
+        snd-opti92x-cs4231=
+                        [HW,ALSA]
+
+        snd-opti93x=    [HW,ALSA]
+
+        snd-pmac=       [HW,ALSA]
+
+        snd-rme32=      [HW,ALSA]
+
+        snd-rme96=      [HW,ALSA]
+
+        snd-rme9652=    [HW,ALSA]
+
+        snd-sb8=        [HW,ALSA]
+
+        snd-sb16=       [HW,ALSA]
+
+        snd-sbawe=      [HW,ALSA]
+
+        snd-serial=     [HW,ALSA]
+
+        snd-sgalaxy=    [HW,ALSA]
+
+        snd-sonicvibes= [HW,ALSA]
+
+        snd-sun-amd7930=
+                        [HW,ALSA]
+
+        snd-sun-cs4231= [HW,ALSA]
+
+        snd-trident=    [HW,ALSA]
+
+        snd-usb-audio=  [HW,ALSA,USB]
+
+        snd-via82xx=    [HW,ALSA]
+
+        snd-virmidi=    [HW,ALSA]
+
+        snd-wavefront=  [HW,ALSA]
+
+        snd-ymfpci=     [HW,ALSA]
diff --git a/Documentation/sound/alsa/soc/DAI.txt b/Documentation/sound/alsa/soc/DAI.txt
index 0ebd7ea9706c..c9679264c559 100644
--- a/Documentation/sound/alsa/soc/DAI.txt
+++ b/Documentation/sound/alsa/soc/DAI.txt
@@ -13,7 +13,7 @@ frame (FRAME) (usually 48kHz) is always driven by the controller. Each AC97
 frame is 21uS long and is divided into 13 time slots.
 
 The AC97 specification can be found at :-
-http://www.intel.com/design/chipsets/audio/ac97_r23.pdf
+http://www.intel.com/p/en_US/business/design
 
 
 I2S
diff --git a/Documentation/sound/alsa/soc/codec.txt b/Documentation/sound/alsa/soc/codec.txt
index 1e95342ed72e..37ba3a72cb76 100644
--- a/Documentation/sound/alsa/soc/codec.txt
+++ b/Documentation/sound/alsa/soc/codec.txt
@@ -143,7 +143,7 @@ struct snd_soc_ops {
 };
 
 Please refer to the ALSA driver PCM documentation for details.
-http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c436.htm
+http://www.alsa-project.org/~iwai/writing-an-alsa-driver/
 
 
 5 - DAPM description.
diff --git a/Documentation/sound/alsa/soc/platform.txt b/Documentation/sound/alsa/soc/platform.txt
index b681d17fc388..06d835987c6a 100644
--- a/Documentation/sound/alsa/soc/platform.txt
+++ b/Documentation/sound/alsa/soc/platform.txt
@@ -39,7 +39,7 @@ struct snd_soc_platform {
 };
 
 Please refer to the ALSA driver documentation for details of audio DMA.
-http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c436.htm
+http://www.alsa-project.org/~iwai/writing-an-alsa-driver/
 
 An example DMA driver is soc/pxa/pxa2xx-pcm.c