Merge branch 'topic/maya44' into for-linus

* topic/maya44:
  ALSA: ice1724 - Add ESI Maya44 support
  ALSA: ice1724 - Allow spec driver to create own routing controls
  ALSA: ice1724 - Add PCI postint to reset sequence
  ALSA: ice1724 - Clean up definitions of DMA records
  ALSA: ice1724 - Check error in set_rate function

diff --combined Documentation/sound/alsa/ALSA-Configuration.txt
index 8cf17fe,821a994..945de36
--- 1/Documentation/sound/alsa/ALSA-Configuration.txt
--- 2/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@@ -460,25 -460,6 +460,25 @@@ Prior to version 0.9.0rc4 options had 
  
      The power-management is supported.
  
 +  Module snd-ctxfi
 +  ----------------
 +
 +    Module for Creative Sound Blaster X-Fi boards (20k1 / 20k2 chips)
 +      * Creative Sound Blaster X-Fi Titanium Fatal1ty Champion Series
 +      * Creative Sound Blaster X-Fi Titanium Fatal1ty Professional Series
 +      * Creative Sound Blaster X-Fi Titanium Professional Audio
 +      * Creative Sound Blaster X-Fi Titanium
 +      * Creative Sound Blaster X-Fi Elite Pro
 +      * Creative Sound Blaster X-Fi Platinum
 +      * Creative Sound Blaster X-Fi Fatal1ty
 +      * Creative Sound Blaster X-Fi XtremeGamer
 +      * Creative Sound Blaster X-Fi XtremeMusic
 +
 +    reference_rate    - reference sample rate, 44100 or 48000 (default)
 +    multiple          - multiple to ref. sample rate, 1 or 2 (default)
 +
 +    This module supports multiple cards.
 +
    Module snd-darla20
    ------------------
  
@@@ -944,6 -925,7 +944,7 @@@
                        * Onkyo SE-90PCI
                        * Onkyo SE-200PCI
                        * ESI Juli@
+                       * ESI Maya44
                        * Hercules Fortissimo IV
                        * EGO-SYS WaveTerminal 192M
  
@@@ -952,7 -934,7 +953,7 @@@
                  prodigy71xt, prodigy71hifi, prodigyhd2, prodigy192,
                  juli, aureon51, aureon71, universe, ap192, k8x800,
                  phase22, phase28, ms300, av710, se200pci, se90pci,
-                 fortissimo4, sn25p, WT192M
+                 fortissimo4, sn25p, WT192M, maya44
  
      This module supports multiple cards and autoprobe.
  
@@@ -1112,13 -1094,6 +1113,13 @@@
      This module supports multiple cards.
      The driver requires the firmware loader support on kernel.
  
 +  Module snd-lx6464es
 +  -------------------
 +
 +    Module for Digigram LX6464ES boards
 +
 +    This module supports multiple cards.
 +
    Module snd-maestro3
    -------------------