Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Andreas Allacher]

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

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Clemens Ladisch]

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

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Andreas Allacher]

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
>

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

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

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Andreas Allacher]

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

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Andreas Allacher]

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
>

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

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

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Andreas Allacher]

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
>

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Andreas Allacher]

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
>

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Clemens Ladisch]

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

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Andreas Allacher]

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

Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Takashi Iwai]

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

[PATCH] ALSA: virtuoso: add Xonar Essence STX II support

[Clemens Ladisch]

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