ALSA: oxygen: add X-Meridian 2G support

Add support for the AuzenTech X-Meridian 7.1 2G sound card.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
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 7124340038eaf26444c91ee52a453caa62fe05ac..5cd5c96231277d0a7130e789dd1b140934fa3e8f 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1527,6 +1527,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     Module for sound cards based on the C-Media CMI8787/8788 chip:
     * Asound A-8788
     * AuzenTech X-Meridian
+    * AuzenTech X-Meridian 2G
     * Bgears b-Enspirer
     * Club3D Theatron DTS
     * HT-Omega Claro (plus)

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 7b2678a25ca037d40faf238bcf714afafff1a647..ddb5e6969bb469832d688972d5b17c894e3d3fa4 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -218,6 +218,7 @@ config SND_OXYGEN
          C-Media CMI8788 (Oxygen HD Audio) chip:
           * Asound A-8788
           * AuzenTech X-Meridian
+          * AuzenTech X-Meridian 2G
           * Bgears b-Enspirer
           * Club3D Theatron DTS
           * HT-Omega Claro (plus)

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index e187c951b6a043c651a16ce0c49908adbb255529..304f1a5681f391b0a40160407d7468cea12bda66 100644 (file)
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -102,6 +102,8 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
        { OXYGEN_PCI_SUBID(0x14c3, 0x1711), .driver_data = MODEL_2CH_OUTPUT },
        /* AuzenTech X-Meridian */
        { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN },
+       /* AuzenTech X-Meridian 2G */
+       { OXYGEN_PCI_SUBID(0x5431, 0x017a), .driver_data = MODEL_MERIDIAN },
        /* HT-Omega Claro */
        { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO },
        /* HT-Omega Claro halo */