github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 05:27:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: ctxfi: Add SB046x PCI ID

Browse Source 
commit 1b073ebb17 upstream.

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

[ This is only about defining the model name string, and the rest is
  handled just like before, as a default unknown device.
  Edward confirmed that the stuff has been working fine -- tiwai ]

Signed-off-by: Edward Matijevic <motolav@gmail.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/cae7d1a4-8bd9-7dfe-7427-db7e766f7272@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Edward Matijevic 2022-05-20 23:45:15 -05:00 committed by Greg Kroah-Hartman
parent 514f587340
commit 7c57f21349
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/ctxfi/ctatc.c
View File

@ -36,6 +36,7 @@
| ((IEC958_AES3_CON_FS_48000) << 24)) | ((IEC958_AES3_CON_FS_48000) << 24))
static const struct snd_pci_quirk subsys_20k1_list[] = { 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, 0x0022, "SB055x", CTSB055X),
SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X), SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),
SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X), 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] = { static const char *ct_subsys_name[NUM_CTCARDS] = {
/* 20k1 models */ /* 20k1 models */
[CTSB046X] = "SB046x",
[CTSB055X] = "SB055x", [CTSB055X] = "SB055x",
[CTSB073X] = "SB073x", [CTSB073X] = "SB073x",
[CTUAA] = "UAA", [CTUAA] = "UAA",

3
sound/pci/ctxfi/cthardware.h
View File

@ -26,8 +26,9 @@ enum CHIPTYP {
enum CTCARDS { enum CTCARDS {
/* 20k1 models */ /* 20k1 models */
CTSB046X,
CT20K1_MODEL_FIRST = CTSB046X,
CTSB055X, CTSB055X,
CT20K1_MODEL_FIRST = CTSB055X,
CTSB073X, CTSB073X,
CTUAA, CTUAA,
CT20K1_UNKNOWN, CT20K1_UNKNOWN,