Merge branch 'topic/sc6000' into for-linus

* topic/sc6000:
  ALSA: sc6000: enable joystick port
  ALSA: sc6000: fix older card initialization
  ALSA: sc6000: add support for SC-6600 and SC-7000

diff --combined Documentation/sound/alsa/ALSA-Configuration.txt
index 096af12a0afa4c24f95835f0d7f85f9fff627bf8,11a80a9c715b79ad12beebf39406c6cbfa364f40..5c08d96f407cb2afc95836ae987963afd371bc7e
--- 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,7 -925,6 +944,7 @@@
                        * Onkyo SE-90PCI
                        * Onkyo SE-200PCI
                        * ESI Juli@
 +                      * ESI Maya44
                        * Hercules Fortissimo IV
                        * EGO-SYS WaveTerminal 192M
  
@@@ -953,7 -933,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.
  
@@@ -1113,13 -1093,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
    -------------------
  
@@@ -1570,13 -1543,15 +1570,15 @@@
    Module snd-sc6000
    -----------------
  
-     Module for Gallant SC-6000 soundcard.
+     Module for Gallant SC-6000 soundcard and later models: SC-6600
+     and SC-7000.
  
      port      - Port # (0x220 or 0x240)
      mss_port  - MSS Port # (0x530 or 0xe80)
      irq               - IRQ # (5,7,9,10,11)
      mpu_irq   - MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq
      dma               - DMA # (1,3,0)
+     joystick  - Enable gameport - 0 = disable (default), 1 = enable
  
      This module supports multiple cards.
  
@@@ -1886,8 -1861,7 +1888,8 @@@
    -------------------
  
      Module for sound cards based on the Asus AV100/AV200 chips,
 -    i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), and Essence STX.
 +    i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), Essence ST
 +    (Deluxe) and Essence STX.
  
      This module supports autoprobe and multiple cards.
  

diff --combined sound/isa/Kconfig
index c6942a4de99b3d5afebe9ec0961c961388a10c96,64129bf220549fdaeb0786bf4250f38f752ef9b7..51a7e3777e17750639faf186befa3a4b4d751520
--- 1/sound/isa/Kconfig
--- 2/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@@ -177,15 -177,18 +177,18 @@@ config SND_ES18X
          will be called snd-es18xx.
  
  config SND_SC6000
-       tristate "Gallant SC-6000, Audio Excel DSP 16"
+       tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16"
        depends on HAS_IOPORT
        select SND_WSS_LIB
        select SND_OPL3_LIB
        select SND_MPU401_UART
        help
-         Say Y here to include support for Gallant SC-6000 card and clones:
+         Say Y here to include support for Gallant SC-6000, SC-6600, SC-7000
+         cards and clones:
          Audio Excel DSP 16 and Zoltrix AV302.
  
+         These cards are based on CompuMedia ASC-9308 or ASC-9408 chips.
+ 
          To compile this driver as a module, choose M here: the module
          will be called snd-sc6000.
  
@@@ -395,6 -398,16 +398,6 @@@ config SND_WAVEFRON
          To compile this driver as a module, choose M here: the module
          will be called snd-wavefront.
  
 -config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
 -      bool "In-kernel firmware for Wavefront"
 -      depends on SND_WAVEFRONT
 -      default y
 -      help
 -        Say Y here to include the static firmware for FX DSP built in
 -        the kernel for the Wavefront driver.  If you choose N here,
 -        you need to install the firmware files from the
 -        alsa-firmware package.
 -
  config SND_MSND_PINNACLE
        tristate "Turtle Beach MultiSound Pinnacle/Fiji driver"
        depends on X86 && EXPERIMENTAL