diff mbox series

ALSA: ctxfi: Add SB046x PCI ID

Message ID cae7d1a4-8bd9-7dfe-7427-db7e766f7272@gmail.com (mailing list archive)
State Accepted
Commit 1b073ebb174d0c7109b438e0a5eb4495137803ec
Headers show
Series ALSA: ctxfi: Add SB046x PCI ID | expand

Commit Message

Edward Matijević May 21, 2022, 4:45 a.m. UTC 
Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names

Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found

Signed-off-by: Edward Matijevic <motolav@gmail.com>
---
 sound/pci/ctxfi/ctatc.c      | 2 ++
 sound/pci/ctxfi/cthardware.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

Comments

Takashi Iwai May 21, 2022, 10:39 a.m. UTC | #1 
On Sat, 21 May 2022 06:45:15 +0200,
Edward Matijevic wrote:
> 
> Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names
> 
> Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
> After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found
> 
> Signed-off-by: Edward Matijevic <motolav@gmail.com>

Does / did everything work as expected?  The model field influence on
a few device-specific setups such as the GPIO initial value, ADC and
DAC selections, not only the name string.


thanks,

Takashi

> ---
>  sound/pci/ctxfi/ctatc.c      | 2 ++
>  sound/pci/ctxfi/cthardware.h | 3 ++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
> index 78f35e88aed6..fbdb8a3d5b8e 100644
> --- a/sound/pci/ctxfi/ctatc.c
> +++ b/sound/pci/ctxfi/ctatc.c
> @@ -36,6 +36,7 @@
>  			    | ((IEC958_AES3_CON_FS_48000) << 24))
>  
>  static const struct snd_pci_quirk subsys_20k1_list[] = {
> +	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),
>  	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),
>  	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
>  	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),
> @@ -64,6 +65,7 @@ static const struct snd_pci_quirk subsys_20k2_list[] = {
>  
>  static const char *ct_subsys_name[NUM_CTCARDS] = {
>  	/* 20k1 models */
> +	[CTSB046X]	= "SB046x",
>  	[CTSB055X]	= "SB055x",
>  	[CTSB073X]	= "SB073x",
>  	[CTUAA]		= "UAA",
> diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h
> index f406b626a28c..2875cec83b8f 100644
> --- a/sound/pci/ctxfi/cthardware.h
> +++ b/sound/pci/ctxfi/cthardware.h
> @@ -26,8 +26,9 @@ enum CHIPTYP {
>  
>  enum CTCARDS {
>  	/* 20k1 models */
> +	CTSB046X,
> +	CT20K1_MODEL_FIRST = CTSB046X,
>  	CTSB055X,
> -	CT20K1_MODEL_FIRST = CTSB055X,
>  	CTSB073X,
>  	CTUAA,
>  	CT20K1_UNKNOWN,
> -- 
> 2.36.1
>
Edward Matijević May 21, 2022, 11:31 a.m. UTC | #2 
On 5/21/22 05:39, Takashi Iwai wrote:
> On Sat, 21 May 2022 06:45:15 +0200,
> Edward Matijevic wrote:
>> Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names
>>
>> Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
>> After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found
>>
>> Signed-off-by: Edward Matijevic <motolav@gmail.com>
> Does / did everything work as expected?  The model field influence on
> a few device-specific setups such as the GPIO initial value, ADC and
> DAC selections, not only the name string.
>
>
> thanks,
>
> Takashi

When first wrote the patch years ago I still had audio output with this patch
and the cards with that ID are already using the default cases/values in cthw20k1.c
so adding the name is just a cosmetic change so it no longer says "Unknown"

>> ---
>>  sound/pci/ctxfi/ctatc.c      | 2 ++
>>  sound/pci/ctxfi/cthardware.h | 3 ++-
>>  2 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
>> index 78f35e88aed6..fbdb8a3d5b8e 100644
>> --- a/sound/pci/ctxfi/ctatc.c
>> +++ b/sound/pci/ctxfi/ctatc.c
>> @@ -36,6 +36,7 @@
>>  			    | ((IEC958_AES3_CON_FS_48000) << 24))
>>  
>>  static const struct snd_pci_quirk subsys_20k1_list[] = {
>> +	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),
>>  	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),
>>  	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
>>  	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),
>> @@ -64,6 +65,7 @@ static const struct snd_pci_quirk subsys_20k2_list[] = {
>>  
>>  static const char *ct_subsys_name[NUM_CTCARDS] = {
>>  	/* 20k1 models */
>> +	[CTSB046X]	= "SB046x",
>>  	[CTSB055X]	= "SB055x",
>>  	[CTSB073X]	= "SB073x",
>>  	[CTUAA]		= "UAA",
>> diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h
>> index f406b626a28c..2875cec83b8f 100644
>> --- a/sound/pci/ctxfi/cthardware.h
>> +++ b/sound/pci/ctxfi/cthardware.h
>> @@ -26,8 +26,9 @@ enum CHIPTYP {
>>  
>>  enum CTCARDS {
>>  	/* 20k1 models */
>> +	CTSB046X,
>> +	CT20K1_MODEL_FIRST = CTSB046X,
>>  	CTSB055X,
>> -	CT20K1_MODEL_FIRST = CTSB055X,
>>  	CTSB073X,
>>  	CTUAA,
>>  	CT20K1_UNKNOWN,
>> -- 
>> 2.36.1
>>
Takashi Iwai May 23, 2022, 7:47 a.m. UTC | #3 
On Sat, 21 May 2022 13:31:02 +0200,
Edward MatijeviH7 wrote:
> 
> On 5/21/22 05:39, Takashi Iwai wrote:
> > On Sat, 21 May 2022 06:45:15 +0200,
> > Edward Matijevic wrote:
> >> Adds the PCI ID for X-Fi cards sold under the Platnum and XtremeMusic names
> >>
> >> Before: snd_ctxfi 0000:05:05.0: chip 20K1 model Unknown (1102:0021) is found
> >> After: snd_ctxfi 0000:05:05.0: chip 20K1 model SB046x (1102:0021) is found
> >>
> >> Signed-off-by: Edward Matijevic <motolav@gmail.com>
> > Does / did everything work as expected?  The model field influence on
> > a few device-specific setups such as the GPIO initial value, ADC and
> > DAC selections, not only the name string.
> >
> >
> > thanks,
> >
> > Takashi
> 
> When first wrote the patch years ago I still had audio output with this patch
> and the cards with that ID are already using the default cases/values in cthw20k1.c
> so adding the name is just a cosmetic change so it no longer says "Unknown"

OK, now I applied with a bit more comment.


thanks,

Takashi
diff mbox series

Patch

diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 78f35e88aed6..fbdb8a3d5b8e 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -36,6 +36,7 @@ 
 			    | ((IEC958_AES3_CON_FS_48000) << 24))
 
 static const struct snd_pci_quirk subsys_20k1_list[] = {
+	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),
@@ -64,6 +65,7 @@  static const struct snd_pci_quirk subsys_20k2_list[] = {
 
 static const char *ct_subsys_name[NUM_CTCARDS] = {
 	/* 20k1 models */
+	[CTSB046X]	= "SB046x",
 	[CTSB055X]	= "SB055x",
 	[CTSB073X]	= "SB073x",
 	[CTUAA]		= "UAA",
diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h
index f406b626a28c..2875cec83b8f 100644
--- a/sound/pci/ctxfi/cthardware.h
+++ b/sound/pci/ctxfi/cthardware.h
@@ -26,8 +26,9 @@  enum CHIPTYP {
 
 enum CTCARDS {
 	/* 20k1 models */
+	CTSB046X,
+	CT20K1_MODEL_FIRST = CTSB046X,
 	CTSB055X,
-	CT20K1_MODEL_FIRST = CTSB055X,
 	CTSB073X,
 	CTUAA,
 	CT20K1_UNKNOWN,