浏览代码

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>
Clemens Ladisch 14 年之前
父节点
当前提交
8443d2eb81
共有 3 个文件被更改,包括 4 次插入0 次删除
  1. 1 0
      Documentation/sound/alsa/ALSA-Configuration.txt
  2. 1 0
      sound/pci/Kconfig
  3. 2 0
      sound/pci/oxygen/oxygen.c

+ 1 - 0
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:
     Module for sound cards based on the C-Media CMI8787/8788 chip:
     * Asound A-8788
     * Asound A-8788
     * AuzenTech X-Meridian
     * AuzenTech X-Meridian
+    * AuzenTech X-Meridian 2G
     * Bgears b-Enspirer
     * Bgears b-Enspirer
     * Club3D Theatron DTS
     * Club3D Theatron DTS
     * HT-Omega Claro (plus)
     * HT-Omega Claro (plus)

+ 1 - 0
sound/pci/Kconfig

@@ -218,6 +218,7 @@ config SND_OXYGEN
 	  C-Media CMI8788 (Oxygen HD Audio) chip:
 	  C-Media CMI8788 (Oxygen HD Audio) chip:
 	   * Asound A-8788
 	   * Asound A-8788
 	   * AuzenTech X-Meridian
 	   * AuzenTech X-Meridian
+	   * AuzenTech X-Meridian 2G
 	   * Bgears b-Enspirer
 	   * Bgears b-Enspirer
 	   * Club3D Theatron DTS
 	   * Club3D Theatron DTS
 	   * HT-Omega Claro (plus)
 	   * HT-Omega Claro (plus)

+ 2 - 0
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 },
 	{ OXYGEN_PCI_SUBID(0x14c3, 0x1711), .driver_data = MODEL_2CH_OUTPUT },
 	/* AuzenTech X-Meridian */
 	/* AuzenTech X-Meridian */
 	{ OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_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 */
 	/* HT-Omega Claro */
 	{ OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO },
 	{ OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO },
 	/* HT-Omega Claro halo */
 	/* HT-Omega Claro halo */