Browse Source

ALSA: virtuoso: add Xonar Essence STX II support

commit f42bb22243 upstream.

Just add the PCI ID for the STX II.  It appears to work the same as the
STX, except for the addition of the not-yet-supported daughterboard.

Tested-by: Mario <fugazzi99@gmail.com>
Tested-by: corubba <corubba@gmx.de>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
isee-imx_3.14.28.y
Clemens Ladisch 6 years ago
committed by Greg Kroah-Hartman
parent
commit
1ce3b22b30
4 changed files with 15 additions and 6 deletions
  1. +2
    -2
      Documentation/sound/alsa/ALSA-Configuration.txt
  2. +2
    -2
      sound/pci/Kconfig
  3. +1
    -0
      sound/pci/oxygen/virtuoso.c
  4. +10
    -2
      sound/pci/oxygen/xonar_pcm179x.c

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

@ -2026,8 +2026,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
-------------------
Module for sound cards based on the Asus AV66/AV100/AV200 chips,
i.e., Xonar D1, DX, D2, D2X, DS, Essence ST (Deluxe), Essence STX,
HDAV1.3 (Deluxe), and HDAV1.3 Slim.
i.e., Xonar D1, DX, D2, D2X, DS, DSX, Essence ST (Deluxe),
Essence STX (II), HDAV1.3 (Deluxe), and HDAV1.3 Slim.
This module supports autoprobe and multiple cards.


+ 2
- 2
sound/pci/Kconfig View File

@ -859,8 +859,8 @@ config SND_VIRTUOSO
select SND_JACK if INPUT=y || INPUT=SND
help
Say Y here to include support for sound cards based on the
Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS,
Essence ST (Deluxe), and Essence STX.
Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS, DSX,
Essence ST (Deluxe), and Essence STX (II).
Support for the HDAV1.3 (Deluxe) and HDAV1.3 Slim is experimental;
for the Xense, missing.


+ 1
- 0
sound/pci/oxygen/virtuoso.c View File

@ -53,6 +53,7 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
{ OXYGEN_PCI_SUBID(0x1043, 0x835e) },
{ OXYGEN_PCI_SUBID(0x1043, 0x838e) },
{ OXYGEN_PCI_SUBID(0x1043, 0x8522) },
{ OXYGEN_PCI_SUBID(0x1043, 0x85f4) },
{ OXYGEN_PCI_SUBID_BROKEN_EEPROM },
{ }
};


+ 10
- 2
sound/pci/oxygen/xonar_pcm179x.c View File

@ -100,8 +100,8 @@
*/
/*
* Xonar Essence ST (Deluxe)/STX
* -----------------------------
* Xonar Essence ST (Deluxe)/STX (II)
* ----------------------------------
*
* CMI8788:
*
@ -1138,6 +1138,14 @@ int get_xonar_pcm179x_model(struct oxygen *chip,
chip->model.resume = xonar_stx_resume;
chip->model.set_dac_params = set_pcm1796_params;
break;
case 0x85f4:
chip->model = model_xonar_st;
/* TODO: daughterboard support */
chip->model.shortname = "Xonar STX II";
chip->model.init = xonar_stx_init;
chip->model.resume = xonar_stx_resume;
chip->model.set_dac_params = set_pcm1796_params;
break;
default:
return -EINVAL;
}


Loading…
Cancel
Save