* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support [not found] <53FC4901.6070908@allacher.com> @ 2014-08-26 8:47 ` Andreas Allacher 2014-08-26 9:03 ` Clemens Ladisch 0 siblings, 1 reply; 13+ messages in thread From: Andreas Allacher @ 2014-08-26 8:47 UTC (permalink / raw) To: alsa-devel On 26.08.2014 10:44, Andreas Allacher wrote: > Andreas Allacher wrote: > >/ Is there any reason why the daughterboard does not work yet? > / > No code written yet. > > Does your question imply that you would be able to test it? > > > Regards, > Clemens Not yet, but I would be willing to buy and test it, if someone were to write the code. In that case I would order the device today or tomorrow. Regards, Andreas ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support 2014-08-26 8:47 ` [PATCH] ALSA: virtuoso: add Xonar Essence STX II support Andreas Allacher @ 2014-08-26 9:03 ` Clemens Ladisch 2014-08-26 10:45 ` Andreas Allacher 0 siblings, 1 reply; 13+ messages in thread From: Clemens Ladisch @ 2014-08-26 9:03 UTC (permalink / raw) To: alsa-devel Andreas Allacher wrote: >> Andreas Allacher wrote: >> > Is there any reason why the daughterboard does not work yet? >> >> No code written yet. >> >> Does your question imply that you would be able to test it? > > Not yet, but I would be willing to buy and test it, if someone were to write the code. > In that case I would order the device today or tomorrow. In that case, go ahead, and prepare for recompiling the kernel. Regards, Clemens ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support 2014-08-26 9:03 ` Clemens Ladisch @ 2014-08-26 10:45 ` Andreas Allacher 2014-08-29 7:49 ` Clemens Ladisch 0 siblings, 1 reply; 13+ messages in thread From: Andreas Allacher @ 2014-08-26 10:45 UTC (permalink / raw) To: alsa-devel OK. I will let you know once the device arrives. On 26.08.2014 11:03, Clemens Ladisch wrote: > Andreas Allacher wrote: >>> Andreas Allacher wrote: >>>> Is there any reason why the daughterboard does not work yet? >>> No code written yet. >>> >>> Does your question imply that you would be able to test it? >> Not yet, but I would be willing to buy and test it, if someone were to write the code. >> In that case I would order the device today or tomorrow. > In that case, go ahead, and prepare for recompiling the kernel. > > > Regards, > Clemens > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support 2014-08-26 10:45 ` Andreas Allacher @ 2014-08-29 7:49 ` Clemens Ladisch 2014-08-29 18:29 ` Andreas Allacher [not found] ` <5400C662.8030606@gmx.at> 0 siblings, 2 replies; 13+ messages in thread From: Clemens Ladisch @ 2014-08-29 7:49 UTC (permalink / raw) To: Andreas Allacher, alsa-devel In theory, this patch should work: --- a/sound/pci/oxygen/xonar_pcm179x.c +++ b/sound/pci/oxygen/xonar_pcm179x.c @@ -419,6 +419,7 @@ data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE; data->dacs = chip->model.dac_channels_mixer / 2; + data->h6 = chip->model.dac_channels_mixer > 2; data->hp_gain_offset = 2*-18; pcm1796_init(chip); @@ -1140,8 +1141,18 @@ break; case 0x85f4: chip->model = model_xonar_st; - /* TODO: daughterboard support */ - chip->model.shortname = "Xonar STX II"; + oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK); + switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DB_MASK) { + default: + chip->model.shortname = "Xonar STX II"; + break; + case GPIO_DB_H6: + chip->model.shortname = "Xonar STX II+H6"; + chip->model.dac_channels_pcm = 8; + chip->model.dac_channels_mixer = 8; + chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128); + break; + } chip->model.init = xonar_stx_init; chip->model.resume = xonar_stx_resume; chip->model.set_dac_params = set_pcm1796_params; ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support 2014-08-29 7:49 ` Clemens Ladisch @ 2014-08-29 18:29 ` Andreas Allacher [not found] ` <5400C662.8030606@gmx.at> 1 sibling, 0 replies; 13+ messages in thread From: Andreas Allacher @ 2014-08-29 18:29 UTC (permalink / raw) To: alsa-devel OK. The card arrived today. I will most likely test it tomorrow or the day afterwards. Is the path already in the kernel source git or do I have to apply it manually? Regards, Andreas Allacher Am 29.08.2014 09:49, schrieb Clemens Ladisch: > In theory, this patch should work: > > --- a/sound/pci/oxygen/xonar_pcm179x.c > +++ b/sound/pci/oxygen/xonar_pcm179x.c > @@ -419,6 +419,7 @@ > > data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE; > data->dacs = chip->model.dac_channels_mixer / 2; > + data->h6 = chip->model.dac_channels_mixer > 2; > data->hp_gain_offset = 2*-18; > > pcm1796_init(chip); > @@ -1140,8 +1141,18 @@ > break; > case 0x85f4: > chip->model = model_xonar_st; > - /* TODO: daughterboard support */ > - chip->model.shortname = "Xonar STX II"; > + oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK); > + switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DB_MASK) { > + default: > + chip->model.shortname = "Xonar STX II"; > + break; > + case GPIO_DB_H6: > + chip->model.shortname = "Xonar STX II+H6"; > + chip->model.dac_channels_pcm = 8; > + chip->model.dac_channels_mixer = 8; > + chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128); > + break; > + } > chip->model.init = xonar_stx_init; > chip->model.resume = xonar_stx_resume; > chip->model.set_dac_params = set_pcm1796_params; > ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <5400C662.8030606@gmx.at>]
[parent not found: <5400CF94.8030503@ladisch.de>]
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support [not found] ` <5400CF94.8030503@ladisch.de> @ 2014-08-31 10:41 ` Andreas Allacher 2014-09-02 13:48 ` Andreas Allacher 2014-09-06 8:12 ` Andreas Allacher 2 siblings, 0 replies; 13+ messages in thread From: Andreas Allacher @ 2014-08-31 10:41 UTC (permalink / raw) To: alsa-devel; +Cc: Clemens Ladisch Just to let you know. I might not be able to do the test today (but I hope I will be able to). If not, it will be sometime in the coming week but cannot say when. Regards, Andreas Am 29.08.2014 21:08, schrieb Clemens Ladisch: > Andreas Allacher wrote: >> Is the path already in the kernel source git or do I have to apply it manually? > This patch is completely untested and not yet in any git. > > > Regards, > Clemens > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support [not found] ` <5400CF94.8030503@ladisch.de> 2014-08-31 10:41 ` Andreas Allacher @ 2014-09-02 13:48 ` Andreas Allacher 2014-09-02 20:06 ` Andreas Allacher 2014-09-06 8:12 ` Andreas Allacher 2 siblings, 1 reply; 13+ messages in thread From: Andreas Allacher @ 2014-09-02 13:48 UTC (permalink / raw) To: alsa-devel; +Cc: Clemens Ladisch Hi, I just tested the card with the H6 board and the patch and it seems to work fine - only tested 5.1 because I do not have 7.1 but I guess 7.1 should work as well. One question: Could it be that under Linux the same sound volume is a bit lower than under Windows (not really a problem but...)? Will this patch make it into 3.17 final or will it be moved to 3.18? Regards, Andreas Clemens Ladisch wrote: > Andreas Allacher wrote: >> Is the path already in the kernel source git or do I have to apply it manually? > This patch is completely untested and not yet in any git. > > > Regards, > Clemens > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support 2014-09-02 13:48 ` Andreas Allacher @ 2014-09-02 20:06 ` Andreas Allacher 0 siblings, 0 replies; 13+ messages in thread From: Andreas Allacher @ 2014-09-02 20:06 UTC (permalink / raw) To: alsa-devel I also tested the card with disconnected H6 board. There the 5.1 option was - as is correct - gone and the front (stereo) speakers worked correctly too. Am 02.09.2014 15:48, schrieb Andreas Allacher: > Hi, > > I just tested the card with the H6 board and the patch and it seems to > work fine - only tested 5.1 because I do not have 7.1 but I guess 7.1 > should work as well. > One question: Could it be that under Linux the same sound volume is a > bit lower than under Windows (not really a problem but...)? > > Will this patch make it into 3.17 final or will it be moved to 3.18? > > Regards, > Andreas > > > Clemens Ladisch wrote: >> Andreas Allacher wrote: >>> Is the path already in the kernel source git or do I have to apply >>> it manually? >> This patch is completely untested and not yet in any git. >> >> >> Regards, >> Clemens >> > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support [not found] ` <5400CF94.8030503@ladisch.de> 2014-08-31 10:41 ` Andreas Allacher 2014-09-02 13:48 ` Andreas Allacher @ 2014-09-06 8:12 ` Andreas Allacher 2 siblings, 0 replies; 13+ messages in thread From: Andreas Allacher @ 2014-09-06 8:12 UTC (permalink / raw) To: alsa-devel Hi, as I have tested the patch and it works, shouldn't someone merge it with kernel git? Am 29.08.2014 21:08, schrieb Clemens Ladisch: > Andreas Allacher wrote: >> Is the path already in the kernel source git or do I have to apply it manually? > This patch is completely untested and not yet in any git. > > > Regards, > Clemens > ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <53FC2D80.7020509@allacher.com>]
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support [not found] <53FC2D80.7020509@allacher.com> @ 2014-08-26 6:49 ` Andreas Allacher 2014-08-26 6:59 ` Clemens Ladisch 0 siblings, 1 reply; 13+ messages in thread From: Andreas Allacher @ 2014-08-26 6:49 UTC (permalink / raw) To: alsa-devel Is there any reason why the daughterboard does not work yet or hasn't it only been tested yet? Any idea how much work it would be to implement daughterboard support? Regards, Andreas At Mon, 04 Aug 2014 15:17:55 +0200, Andreas Allacher wrote: > At Mon, 04 Aug 2014 15:17:55 +0200, > Clemens Ladisch wrote: > >/ > />/ 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 at gmail.com <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>> > />/ Tested-by: corubba <corubba at gmx.de <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>> > />/ Cc: <stable at vger.kernel.org <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>> > />/ Signed-off-by: Clemens Ladisch <clemens at ladisch.de <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>> > / > Applied, thanks. > > > Takashi > > >/ --- > />/ Documentation/sound/alsa/ALSA-Configuration.txt | 4 ++-- > />/ sound/pci/Kconfig | 4 ++-- > />/ sound/pci/oxygen/virtuoso.c | 1 + > />/ sound/pci/oxygen/xonar_pcm179x.c | 12 ++++++++++-- > />/ 4 files changed, 15 insertions(+), 6 deletions(-) > />/ > />/ diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt > />/ index 7ccf933..48148d6 100644 > />/ --- a/Documentation/sound/alsa/ALSA-Configuration.txt > />/ +++ b/Documentation/sound/alsa/ALSA-Configuration.txt > />/ @@ -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. > />/ > />/ diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig > />/ index 3a3a3a7..50dd008 100644 > />/ --- a/sound/pci/Kconfig > />/ +++ b/sound/pci/Kconfig > />/ @@ -858,8 +858,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. > />/ > />/ diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c > />/ index 64b9fda..dbbbacf 100644 > />/ --- a/sound/pci/oxygen/virtuoso.c > />/ +++ b/sound/pci/oxygen/virtuoso.c > />/ @@ -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 }, > />/ { } > />/ }; > />/ diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c > />/ index c8c7f2c..e026059 100644 > />/ --- a/sound/pci/oxygen/xonar_pcm179x.c > />/ +++ b/sound/pci/oxygen/xonar_pcm179x.c > />/ @@ -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; > />/ } > />/ / ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support 2014-08-26 6:49 ` Andreas Allacher @ 2014-08-26 6:59 ` Clemens Ladisch 0 siblings, 0 replies; 13+ messages in thread From: Clemens Ladisch @ 2014-08-26 6:59 UTC (permalink / raw) To: alsa-devel Andreas Allacher wrote: > Is there any reason why the daughterboard does not work yet? No code written yet. Does your question imply that you would be able to test it? Regards, Clemens ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] Asus Essence STX II @ 2014-08-03 1:45 corubba 2014-08-04 13:17 ` [PATCH] ALSA: virtuoso: add Xonar Essence STX II support Clemens Ladisch 0 siblings, 1 reply; 13+ messages in thread From: corubba @ 2014-08-03 1:45 UTC (permalink / raw) To: alsa-devel, alsa-user Today I got my new sound card, a Asus Essence STX II. After plugin it in and booting my Linux machine, the card was recognized by lspci as audio controller, but not listed by alsa as soundcard. Information on support for this new card under linux are hard to find. Due to the hardware similarities between STX and STX II, I tried to modify the existing STX driver in order to work for the STX II too. And it seems to work quiet well: I have sound, can change the volumes, switch between speaker/headphone/frontpanel, enable the mic boost etc. I don't have the H6 childboard for surround sound, so I can't test that. I tested my patch [1] with a 3.15.8 kernel under Arch Linux. Just wanted to share this information for others to get it quickly working, or maybe even include it after a review from the devs. [1] http://pastebin.com/GaGguPvt ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] ALSA: virtuoso: add Xonar Essence STX II support 2014-08-03 1:45 [PATCH] Asus Essence STX II corubba @ 2014-08-04 13:17 ` Clemens Ladisch 2014-08-04 13:21 ` Takashi Iwai 0 siblings, 1 reply; 13+ messages in thread From: Clemens Ladisch @ 2014-08-04 13:17 UTC (permalink / raw) To: Takashi Iwai, alsa-devel; +Cc: Mario, corubba 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> Cc: <stable@vger.kernel.org> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> --- Documentation/sound/alsa/ALSA-Configuration.txt | 4 ++-- sound/pci/Kconfig | 4 ++-- sound/pci/oxygen/virtuoso.c | 1 + sound/pci/oxygen/xonar_pcm179x.c | 12 ++++++++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 7ccf933..48148d6 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -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. diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 3a3a3a7..50dd008 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -858,8 +858,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. diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 64b9fda..dbbbacf 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -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 }, { } }; diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c index c8c7f2c..e026059 100644 --- a/sound/pci/oxygen/xonar_pcm179x.c +++ b/sound/pci/oxygen/xonar_pcm179x.c @@ -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; } ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support 2014-08-04 13:17 ` [PATCH] ALSA: virtuoso: add Xonar Essence STX II support Clemens Ladisch @ 2014-08-04 13:21 ` Takashi Iwai 0 siblings, 0 replies; 13+ messages in thread From: Takashi Iwai @ 2014-08-04 13:21 UTC (permalink / raw) To: Clemens Ladisch; +Cc: alsa-devel, Mario, corubba At Mon, 04 Aug 2014 15:17:55 +0200, Clemens Ladisch wrote: > > 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> > Cc: <stable@vger.kernel.org> > Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Applied, thanks. Takashi > --- > Documentation/sound/alsa/ALSA-Configuration.txt | 4 ++-- > sound/pci/Kconfig | 4 ++-- > sound/pci/oxygen/virtuoso.c | 1 + > sound/pci/oxygen/xonar_pcm179x.c | 12 ++++++++++-- > 4 files changed, 15 insertions(+), 6 deletions(-) > > diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt > index 7ccf933..48148d6 100644 > --- a/Documentation/sound/alsa/ALSA-Configuration.txt > +++ b/Documentation/sound/alsa/ALSA-Configuration.txt > @@ -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. > > diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig > index 3a3a3a7..50dd008 100644 > --- a/sound/pci/Kconfig > +++ b/sound/pci/Kconfig > @@ -858,8 +858,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. > > diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c > index 64b9fda..dbbbacf 100644 > --- a/sound/pci/oxygen/virtuoso.c > +++ b/sound/pci/oxygen/virtuoso.c > @@ -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 }, > { } > }; > diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c > index c8c7f2c..e026059 100644 > --- a/sound/pci/oxygen/xonar_pcm179x.c > +++ b/sound/pci/oxygen/xonar_pcm179x.c > @@ -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; > } > ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2014-09-06 8:12 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <53FC4901.6070908@allacher.com> 2014-08-26 8:47 ` [PATCH] ALSA: virtuoso: add Xonar Essence STX II support Andreas Allacher 2014-08-26 9:03 ` Clemens Ladisch 2014-08-26 10:45 ` Andreas Allacher 2014-08-29 7:49 ` Clemens Ladisch 2014-08-29 18:29 ` Andreas Allacher [not found] ` <5400C662.8030606@gmx.at> [not found] ` <5400CF94.8030503@ladisch.de> 2014-08-31 10:41 ` Andreas Allacher 2014-09-02 13:48 ` Andreas Allacher 2014-09-02 20:06 ` Andreas Allacher 2014-09-06 8:12 ` Andreas Allacher [not found] <53FC2D80.7020509@allacher.com> 2014-08-26 6:49 ` Andreas Allacher 2014-08-26 6:59 ` Clemens Ladisch 2014-08-03 1:45 [PATCH] Asus Essence STX II corubba 2014-08-04 13:17 ` [PATCH] ALSA: virtuoso: add Xonar Essence STX II support Clemens Ladisch 2014-08-04 13:21 ` Takashi Iwai
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.