Skip to content

Commit 4492363

Browse files
sgiurgiutiwai
authored andcommitted
ALSA: virtuoso: Xonar DSX support
This patch adds support for ASUS - Xonar DSX sound cards. Tested on openSUSE 12.2 with kernel: Linux 3.4.6-2.10-desktop Digilent#1 SMP PREEMPT Thu Jul 26 09:36:26 UTC 2012 (641c197) x86_64 x86_64 x86_64 GNU/Linux Works: - play sounds - adjust volume on master channel. - mute . Since Xonar DS uses the same chip, everything that works for DS should work for DSX as well. Signed-off-by: Sergiu Giurgiu <sgiurgiu11@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 3bef1c3 commit 4492363

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

sound/pci/oxygen/virtuoso.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
5252
{ OXYGEN_PCI_SUBID(0x1043, 0x835d) },
5353
{ OXYGEN_PCI_SUBID(0x1043, 0x835e) },
5454
{ OXYGEN_PCI_SUBID(0x1043, 0x838e) },
55+
{ OXYGEN_PCI_SUBID(0x1043, 0x8522) },
5556
{ OXYGEN_PCI_SUBID_BROKEN_EEPROM },
5657
{ }
5758
};

sound/pci/oxygen/xonar_wm87x6.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,6 @@ static void dump_wm87x6_registers(struct oxygen *chip,
12551255
}
12561256

12571257
static const struct oxygen_model model_xonar_ds = {
1258-
.shortname = "Xonar DS",
12591258
.longname = "Asus Virtuoso 66",
12601259
.chip = "AV200",
12611260
.init = xonar_ds_init,
@@ -1327,6 +1326,11 @@ int __devinit get_xonar_wm87x6_model(struct oxygen *chip,
13271326
switch (id->subdevice) {
13281327
case 0x838e:
13291328
chip->model = model_xonar_ds;
1329+
chip->model.shortname = "Xonar DS";
1330+
break;
1331+
case 0x8522:
1332+
chip->model = model_xonar_ds;
1333+
chip->model.shortname = "Xonar DSX";
13301334
break;
13311335
case 0x835e:
13321336
chip->model = model_xonar_hdav_slim;

0 commit comments

Comments
 (0)