[ALSA] Add snd-riptide driver for Conexant Riptide chip

Add snd-riptide driver for Conexant Riptide chip by Peter Gruber.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 1ac2094..5f79efa 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1220,6 +1220,20 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     The power-management is supported.
 
+  Module snd-riptide
+  ------------------
+
+    Module for Conexant Riptide chip
+
+      joystick_port    - Joystick port # (default: 0x200)
+      mpu_port         - MPU401 port # (default: 0x330)
+      opl3_port                - OPL3 port # (default: 0x388)
+
+    This module supports multiple cards.
+    The driver requires the firmware loader support on kernel.
+    You need to install the firmware file "riptide.hex" to the standard
+    firmware path (e.g. /lib/firmware).
+
   Module snd-rme32
   ----------------
 

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 5517442..933ce36 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -467,6 +467,19 @@ config SND_PCXHR
          To compile this driver as a module, choose M here: the module
          will be called snd-pcxhr.
 
+config SND_RIPTIDE
+       tristate "Conexant Riptide"
+       depends on SND
+       depends on FW_LOADER
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_AC97_CODEC
+       help
+         Say 'Y' or 'M' to include support for Conexant Riptide chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-riptide
+
 config SND_RME32
        tristate "RME Digi32, 32/8, 32 PRO"
        depends on SND

diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index a6c3cd5..daa4253 100644 (file)
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -62,6 +62,7 @@ obj-$(CONFIG_SND) += \
        mixart/ \
        nm256/ \
        pcxhr/ \
+       riptide/ \
        rme9652/ \
        trident/ \
        ymfpci/ \

diff --cc sound/pci/riptide/Makefile
Simple merge

diff --cc sound/pci/riptide/riptide.c
Simple merge