From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH] ALSA: virtuoso: add Xonar Essence STX II support Date: Mon, 04 Aug 2014 15:21:41 +0200 Message-ID: References: <53DD9448.8070804@gmx.de> <53DF8803.7070103@ladisch.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 2CC4D26109F for ; Mon, 4 Aug 2014 15:21:42 +0200 (CEST) In-Reply-To: <53DF8803.7070103@ladisch.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Clemens Ladisch Cc: alsa-devel@alsa-project.org, Mario , corubba List-Id: alsa-devel@alsa-project.org 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 > Tested-by: corubba > Cc: > Signed-off-by: Clemens Ladisch 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; > } >