torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

ALSA: oxygen: add Xonar DGX support

Browse Source 
Add the PCI ID of the Asus Xonar DGX card; it's otherwise
identical with the DG.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2012-05-01 17:40:30 +02:00 committed by Takashi Iwai
parent 1a442cc3df
commit 76bc7a0d0a
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/sound/alsa/ALSA-Configuration.txt
View File

@ -1545,7 +1545,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
Module for sound cards based on the C-Media CMI8786/8787/8788 chip: Module for sound cards based on the C-Media CMI8786/8787/8788 chip:
* Asound A-8788 * Asound A-8788
* Asus Xonar DG * Asus Xonar DG/DGX
* AuzenTech X-Meridian * AuzenTech X-Meridian
* AuzenTech X-Meridian 2G * AuzenTech X-Meridian 2G
* Bgears b-Enspirer * Bgears b-Enspirer

2
sound/pci/Kconfig
View File

@ -228,7 +228,7 @@ config SND_OXYGEN
Say Y here to include support for sound cards based on the Say Y here to include support for sound cards based on the
C-Media CMI8788 (Oxygen HD Audio) chip: C-Media CMI8788 (Oxygen HD Audio) chip:
* Asound A-8788 * Asound A-8788
* Asus Xonar DG * Asus Xonar DG/DGX
* AuzenTech X-Meridian * AuzenTech X-Meridian
* AuzenTech X-Meridian 2G * AuzenTech X-Meridian 2G
* Bgears b-Enspirer * Bgears b-Enspirer

8
sound/pci/oxygen/oxygen.c
View File

@ -94,6 +94,7 @@ enum {
MODEL_2CH_OUTPUT, MODEL_2CH_OUTPUT,
MODEL_HG2PCI, MODEL_HG2PCI,
MODEL_XONAR_DG, MODEL_XONAR_DG,
MODEL_XONAR_DGX,
}; };
static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = { static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
@ -109,6 +110,8 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
{ OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF }, { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF },
/* Asus Xonar DG */ /* Asus Xonar DG */
{ OXYGEN_PCI_SUBID(0x1043, 0x8467), .driver_data = MODEL_XONAR_DG }, { OXYGEN_PCI_SUBID(0x1043, 0x8467), .driver_data = MODEL_XONAR_DG },
/* Asus Xonar DGX */
{ OXYGEN_PCI_SUBID(0x1043, 0x8521), .driver_data = MODEL_XONAR_DGX },
/* PCI 2.0 HD Audio */ /* PCI 2.0 HD Audio */
{ OXYGEN_PCI_SUBID(0x13f6, 0x8782), .driver_data = MODEL_2CH_OUTPUT }, { OXYGEN_PCI_SUBID(0x13f6, 0x8782), .driver_data = MODEL_2CH_OUTPUT },
/* Kuroutoshikou CMI8787-HG2PCI */ /* Kuroutoshikou CMI8787-HG2PCI */
@ -827,6 +830,11 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
break; break;
case MODEL_XONAR_DG: case MODEL_XONAR_DG:
chip->model = model_xonar_dg; chip->model = model_xonar_dg;
chip->model.shortname = "Xonar DG";
break;
case MODEL_XONAR_DGX:
chip->model = model_xonar_dg;
chip->model.shortname = "Xonar DGX";
break; break;
} }
if (id->driver_data == MODEL_MERIDIAN || if (id->driver_data == MODEL_MERIDIAN ||

7
sound/pci/oxygen/xonar_dg.c
View File

@ -1,5 +1,5 @@
/* /*
* card driver for the Xonar DG * card driver for the Xonar DG/DGX
* *
* Copyright (c) Clemens Ladisch <clemens@ladisch.de> * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
* *
@ -17,8 +17,8 @@
*/ */
/* /*
* Xonar DG * Xonar DG/DGX
* -------- * ------------
* *
* CMI8788: * CMI8788:
* *
@ -581,7 +581,6 @@ static void dump_cs4245_registers(struct oxygen *chip,
} }
struct oxygen_model model_xonar_dg = { struct oxygen_model model_xonar_dg = {
.shortname = "Xonar DG",
.longname = "C-Media Oxygen HD Audio", .longname = "C-Media Oxygen HD Audio",
.chip = "CMI8786", .chip = "CMI8786",
.init = dg_init, .init = dg_init,