From: Clemens Ladisch <clemens@ladisch.de>
To: Andreas Allacher <andreas.allacher@gmx.at>, alsa-devel@alsa-project.org
Subject: Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support
Date: Fri, 29 Aug 2014 09:49:41 +0200 [thread overview]
Message-ID: <54003095.200@ladisch.de> (raw)
In-Reply-To: <53FC6532.2080903@gmx.at>
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;
next prev parent reply other threads:[~2014-08-29 7:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54003095.200@ladisch.de \
--to=clemens@ladisch.de \
--cc=alsa-devel@alsa-project.org \
--cc=andreas.allacher@gmx.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox