diff mbox

ALSA: virtuoso: add Xonar Essence STX II support

Message ID 54003095.200@ladisch.de (mailing list archive)
State Accepted
Delegated to: Takashi Iwai
Headers show

Commit Message

Clemens Ladisch Aug. 29, 2014, 7:49 a.m. UTC 
In theory, this patch should work:

Comments

Andreas Allacher Aug. 29, 2014, 6:29 p.m. UTC | #1 
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;
>
Andreas Allacher Aug. 31, 2014, 10:41 a.m. UTC | #2 
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
>
Andreas Allacher Sept. 2, 2014, 1:48 p.m. UTC | #3 
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
>
Andreas Allacher Sept. 2, 2014, 8:06 p.m. UTC | #4 
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
>
Andreas Allacher Sept. 6, 2014, 8:12 a.m. UTC | #5 
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
>
diff mbox

Patch

--- 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;