aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2012-05-01 11:40:30 -0400
committerTakashi Iwai <tiwai@suse.de>2012-05-05 08:24:12 -0400
commit76bc7a0d0a2a833d09fbf9d4e19a7985ef6e276b (patch)
tree41d58e5ed925b3e9979b28c363696f5a361b91e6 /sound/pci
parent1a442cc3df1427c9797085218a6f9acae0b68b15 (diff)
ALSA: oxygen: add Xonar DGX support
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>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/Kconfig2
-rw-r--r--sound/pci/oxygen/oxygen.c8
-rw-r--r--sound/pci/oxygen/xonar_dg.c7
3 files changed, 12 insertions, 5 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 88168044375f..30f0863ff55f 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -228,7 +228,7 @@ config SND_OXYGEN
228 Say Y here to include support for sound cards based on the 228 Say Y here to include support for sound cards based on the
229 C-Media CMI8788 (Oxygen HD Audio) chip: 229 C-Media CMI8788 (Oxygen HD Audio) chip:
230 * Asound A-8788 230 * Asound A-8788
231 * Asus Xonar DG 231 * Asus Xonar DG/DGX
232 * AuzenTech X-Meridian 232 * AuzenTech X-Meridian
233 * AuzenTech X-Meridian 2G 233 * AuzenTech X-Meridian 2G
234 * Bgears b-Enspirer 234 * Bgears b-Enspirer
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 6bc589dc6799..610275bfbaeb 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -94,6 +94,7 @@ enum {
94 MODEL_2CH_OUTPUT, 94 MODEL_2CH_OUTPUT,
95 MODEL_HG2PCI, 95 MODEL_HG2PCI,
96 MODEL_XONAR_DG, 96 MODEL_XONAR_DG,
97 MODEL_XONAR_DGX,
97}; 98};
98 99
99static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = { 100static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
@@ -109,6 +110,8 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
109 { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF }, 110 { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF },
110 /* Asus Xonar DG */ 111 /* Asus Xonar DG */
111 { OXYGEN_PCI_SUBID(0x1043, 0x8467), .driver_data = MODEL_XONAR_DG }, 112 { OXYGEN_PCI_SUBID(0x1043, 0x8467), .driver_data = MODEL_XONAR_DG },
113 /* Asus Xonar DGX */
114 { OXYGEN_PCI_SUBID(0x1043, 0x8521), .driver_data = MODEL_XONAR_DGX },
112 /* PCI 2.0 HD Audio */ 115 /* PCI 2.0 HD Audio */
113 { OXYGEN_PCI_SUBID(0x13f6, 0x8782), .driver_data = MODEL_2CH_OUTPUT }, 116 { OXYGEN_PCI_SUBID(0x13f6, 0x8782), .driver_data = MODEL_2CH_OUTPUT },
114 /* Kuroutoshikou CMI8787-HG2PCI */ 117 /* Kuroutoshikou CMI8787-HG2PCI */
@@ -827,6 +830,11 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
827 break; 830 break;
828 case MODEL_XONAR_DG: 831 case MODEL_XONAR_DG:
829 chip->model = model_xonar_dg; 832 chip->model = model_xonar_dg;
833 chip->model.shortname = "Xonar DG";
834 break;
835 case MODEL_XONAR_DGX:
836 chip->model = model_xonar_dg;
837 chip->model.shortname = "Xonar DGX";
830 break; 838 break;
831 } 839 }
832 if (id->driver_data == MODEL_MERIDIAN || 840 if (id->driver_data == MODEL_MERIDIAN ||
diff --git a/sound/pci/oxygen/xonar_dg.c b/sound/pci/oxygen/xonar_dg.c
index 793bdf03d7e0..77acd790ea47 100644
--- a/sound/pci/oxygen/xonar_dg.c
+++ b/sound/pci/oxygen/xonar_dg.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * card driver for the Xonar DG 2 * card driver for the Xonar DG/DGX
3 * 3 *
4 * Copyright (c) Clemens Ladisch <clemens@ladisch.de> 4 * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
5 * 5 *
@@ -17,8 +17,8 @@
17 */ 17 */
18 18
19/* 19/*
20 * Xonar DG 20 * Xonar DG/DGX
21 * -------- 21 * ------------
22 * 22 *
23 * CMI8788: 23 * CMI8788:
24 * 24 *
@@ -581,7 +581,6 @@ static void dump_cs4245_registers(struct oxygen *chip,
581} 581}
582 582
583struct oxygen_model model_xonar_dg = { 583struct oxygen_model model_xonar_dg = {
584 .shortname = "Xonar DG",
585 .longname = "C-Media Oxygen HD Audio", 584 .longname = "C-Media Oxygen HD Audio",
586 .chip = "CMI8786", 585 .chip = "CMI8786",
587 .init = dg_init, 586 .init = dg_init,